From e42d5f26a9a75511a2926d2faeda1bcd3626ff1d Mon Sep 17 00:00:00 2001
From: gloas <gloas@git-test.afi-sa.fr>
Date: Tue, 8 Oct 2013 12:14:52 +0000
Subject: [PATCH] =?UTF-8?q?boite=20news:=20l=20article=20cr=C3=A9=C3=A9=20?=
 =?UTF-8?q?est=20ajout=C3=A9=20a=20la=20config=20de=20la=20boite=20dans=20?=
 =?UTF-8?q?les=20id=20items?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controllers/CmsController.php       | 16 ++++++
 .../admin/controllers/CmsControllerTest.php   | 50 +++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/application/modules/admin/controllers/CmsController.php b/application/modules/admin/controllers/CmsController.php
index 7676b295eb7..04ce6bfd19d 100644
--- a/application/modules/admin/controllers/CmsController.php
+++ b/application/modules/admin/controllers/CmsController.php
@@ -156,6 +156,7 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
 
 
 	public function newsaddAction() {
+
 		$category = Class_ArticleCategorie::getLoader()->find($this->_getParam('id_cat'));
 
 		// pas d'article non catégorisé
@@ -174,6 +175,9 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
 			$article->setDomaineIds($domaine->getId());
 
 		if ($this->_isArticleSaved($article)) {
+			if($id_module = $this->_getParam('id_module')) 
+				$this->updateConfigBoiteNews($id_module,$article);
+
 			$this->_helper->notify('Article ajouté '.$article->getNotifyMessage());
 			$this->_redirect(sprintf('admin/cms/newsedit/id/%d', $article->getId()));
 			return;
@@ -185,6 +189,18 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
 		$this->view->combo_lieu_options = $this->comboLieuOptions();
 	}
  
+	protected function updateConfigBoiteNews($id_module, $article){
+		xdebug_break();
+		$profil = Class_Profil::getCurrentProfil();
+		$module_config = $profil->getModuleAccueilConfig($id_module);
+		$id_items= array_filter(explode('-',$module_config['preferences']['id_items']));
+		array_unshift($id_items,$article->getId());
+		$module_config['preferences']['id_items'] = implode('-',$id_items);
+		$profil->updateModuleConfigAccueil($id_module, $module_config);			
+		$profil->save();
+		return $this;
+	}
+
 
 	public function newseditAction() {
 		$article = Class_Article::getLoader()->find((int)$this->_getParam('id'));
diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php
index cc672bdf27d..27a6d5f1e5b 100644
--- a/tests/application/modules/admin/controllers/CmsControllerTest.php
+++ b/tests/application/modules/admin/controllers/CmsControllerTest.php
@@ -1696,4 +1696,54 @@ class CmsControllerCategorieNotFoundTest extends CmsControllerTestCase {
 }
 
 
+class CmsControllerNewsAddToCatALaUneInNewsModuleActionTest extends CmsControllertestCase {
+
+	public function setup() {
+		parent::setup();
+
+		$cfg_accueil_jeunesse = ['modules' => ['10' => ['division' => '2',
+																										'type_module' => 'NEWS']],
+
+														 'options' => 	[]];
+
+		$this->profil_jeunesse = Class_Profil::getCurrentProfil()
+			->setBrowser('opac')
+			->setTitreSite(null)
+			->setLibelle('Profil Jeunesse')
+			->setCfgAccueil($cfg_accueil_jeunesse);
+
+		Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Profil')
+			->whenCalled('save')
+			->answers(true);
+
+		Class_Article::whenCalled('save')
+			->willDo(
+				function($model){
+					$model->setId(4);
+					return true;
+				});
+
+		$this->postDispatch('/admin/cms/newsadd/id_module/10/id_cat/34',  
+												['titre' => 'Erik Truffaz - Ladyland quartet en concert',
+												 'auteur' => Class_Users::newInstanceWithId(1, ['login' => 'tom']),
+												 'id_cat' => 34,
+												 'contenu' => 'Ici: <img src="../../images/bonlieu.jpg" />',
+												 'description' => 'Affiche: <img src="http://localhost' . BASE_URL . '/images/concert.jpg" />']);
+	}
+
+
+	/** @test **/
+	public function boiteNewsShouldDisplayArticleConcert() {
+		$this->assertEquals( 4, Class_Profil::getCurrentProfil()->getModuleAccueilPreferences(10)['id_items']);
+	}
+
+
+	/** @test **/
+	public function profilShouldHaveBeenSaved() {
+		$this->assertTrue(Class_Profil::methodHasBeenCalled('save'));
+	}
+}
+
+
+
 ?>        
\ No newline at end of file
-- 
GitLab