diff --git a/application/modules/admin/controllers/ProfilController.php b/application/modules/admin/controllers/ProfilController.php index a521fa46e7ddc9073ee5d54df6a8c533738fba76..d58f39c845b7a648198543e8c01cff70ea782d05 100644 --- a/application/modules/admin/controllers/ProfilController.php +++ b/application/modules/admin/controllers/ProfilController.php @@ -470,15 +470,13 @@ class Admin_ProfilController extends ZendAfi_Controller_Action { $display="none"; $anchor = $this->view->tagAnchor($this->view->url(['module' => 'admin', - 'controller' => 'accueil', - 'action' => $module->getAction(), - 'id_module' => $id_module, - 'type_module' => $type_module]), - '<img src="'.URL_ADMIN_IMG.'ico/fonctions_admin.png" title="propriétés" style="display:'.$display.'" alt="Propriétés"/>', + 'controller' => 'widget', + 'action' => 'edit-widget', + 'id' => $id_module, + 'id_profil' => $this->_getParam('id_profil')], null, true), + '<img src="'.URL_ADMIN_IMG.'ico/fonctions_admin.png" title="propriétés" style="display:'.$display.'" alt="Propriétés"/>', ['data-popup' => 'true']); - $onclick="majProprietes(this,'".BASE_URL."/admin/accueil/".$module->getAction()."?config=admin&id_profil=".$this->id_profil."',".$module->getPopupWidth().",".$module->getPopupHeight().");"; - $item='<li id="'.$type_module.'" id_module="'.$id_module.'" proprietes="'.$properties.'"><table width="97%"><tr>'; $item.='<td align="left" class="cfg_accueil">'.$module->getLibelle().'</td>'; $item.='<td align="right">' . $anchor . '</td>'; diff --git a/library/ZendAfi/View/Helper/Admin/PropertiesReader.php b/library/ZendAfi/View/Helper/Admin/PropertiesReader.php index 17282685ae6442c136a7466c8ede856170c7a3cb..bc01247514ec6ff69d30e4d8f3711b04012aa72a 100644 --- a/library/ZendAfi/View/Helper/Admin/PropertiesReader.php +++ b/library/ZendAfi/View/Helper/Admin/PropertiesReader.php @@ -55,7 +55,8 @@ class ZendAfi_View_Helper_Admin_PropertiesReader extends ZendAfi_View_Helper_Bas 'onclick' => "$(this).next().slideToggle();"]) . $this->_tag('div', $html, - ['id' => 'objet_props']); + ['id' => 'objet_props', + 'style' => 'display: none;']); } diff --git a/library/ZendAfi/View/Helper/AjaxRedirect.php b/library/ZendAfi/View/Helper/AjaxRedirect.php index b5b5732ec01201b46acb3a71a31e93660299416e..2ce7c14f8ef4e78d68554007cb8c7175ee912275 100644 --- a/library/ZendAfi/View/Helper/AjaxRedirect.php +++ b/library/ZendAfi/View/Helper/AjaxRedirect.php @@ -30,7 +30,7 @@ class ZendAfi_View_Helper_AjaxRedirect extends ZendAfi_View_Helper_BaseHelper { ['class' => 'saving-process']) . $this->_tag('script', - 'document.location.href = document.location.href;'); + 'location.reload()'); } } ?> \ No newline at end of file diff --git a/public/opac/java/on_form_change_do/on_form_change_do.js b/public/opac/java/on_form_change_do/on_form_change_do.js index caca32a3137413df457c54623a6ba04b664f6d4d..14dc63c57cda25e0d5e509b78db91951e8ce3165 100644 --- a/public/opac/java/on_form_change_do/on_form_change_do.js +++ b/public/opac/java/on_form_change_do/on_form_change_do.js @@ -21,15 +21,16 @@ (function ( $ ) { $.fn.on_form_change_do = function(options) { var button = $(this); + var callback = options.callback; - var form = button.closest('form'); + var form = button.parent().nextAll('form'); if (!form.size()) - form = button.parent().nextAll('form'); + form = button.parent().prevAll('form'); if (!form.size()) - form = button.parent().prevAll('form'); + form = button.closest('form'); if(!form.size()) return; diff --git a/tests/application/modules/admin/controllers/ProfilControllerPageAccueilTest.php b/tests/application/modules/admin/controllers/ProfilControllerPageAccueilTest.php index 3ecc71715bb350899083ff77ab04c3a7582ae24a..74ade51703b530fb2f176f7451c94365dc533a01 100644 --- a/tests/application/modules/admin/controllers/ProfilControllerPageAccueilTest.php +++ b/tests/application/modules/admin/controllers/ProfilControllerPageAccueilTest.php @@ -124,13 +124,13 @@ class Admin_ProfilControllerPageAccueilJeunesseTest extends Admin_ProfilControll /** @test **/ public function boitePanierShouldBeInDivisionFive() { - $this->assertXPath('//ul[@id="box5"]/li[@id="PANIER"][@id_module="99"]//a[contains(@href, "accueil/panier")]'); + $this->assertXPath('//ul[@id="box5"]/li[@id="PANIER"][@id_module="99"]//a[contains(@href, "admin/widget/edit-widget/id/99/id_profil/7")]'); } /** @test */ public function boitePretsShouldBeAvailable() { - $this->assertXPathContentContains('//ul[@id="allItems"]/li[@id="PRETS"]','Prêts'); + $this->assertXPathContentContains('//ul[@id="allItems"]/li[@id="PRETS"]','Mes prêts'); } @@ -141,25 +141,25 @@ class Admin_ProfilControllerPageAccueilJeunesseTest extends Admin_ProfilControll /** @test */ public function boitePretsShouldBeInDivisionOne() { - $this->assertXPath('//ul[@id="box1"]/li[@id="PRETS"][@id_module="9"]//a[contains(@href,"accueil/prets")]'); + $this->assertXPath('//ul[@id="box1"]/li[@id="PRETS"][@id_module="9"]//a[contains(@href,"admin/widget/edit-widget/id/9/id_profil/7")]'); } /** @test */ public function boiteReservationsShouldBeAvailable() { - $this->assertXPathContentContains('//ul[@id="allItems"]/li[@id="RESERVATIONS"]','Réservations'); + $this->assertXPathContentContains('//ul[@id="allItems"]/li[@id="RESERVATIONS"]','Mes réservations'); } /** @test */ public function boitePanierShouldBeAvailable() { - $this->assertXPathContentContains('//ul[@id="allItems"]/li[@id="PANIER"]','Panier'); + $this->assertXPathContentContains('//ul[@id="allItems"]/li[@id="PANIER"]','Mes paniers'); } /** @test */ public function boiteReservationsShouldBeInDivisionOne() { - $this->assertXPath('//ul[@id="box1"]/li[@id="RESERVATIONS"][@id_module="8"]//a[contains(@href,"accueil/reservations")]'); + $this->assertXPath('//ul[@id="box1"]/li[@id="RESERVATIONS"][@id_module="8"]//a[contains(@href,"admin/widget/edit-widget/id/8")]'); } @@ -177,7 +177,7 @@ class Admin_ProfilControllerPageAccueilJeunesseTest extends Admin_ProfilControll /** @test */ public function boiteFormationsActionShouldBeFormations() { - $this->assertXPath('//ul[@id="allItems"]/li[@id="FORMATIONS_WIDGET"]//a[contains(@href, "accueil/formations-widget")]', $this->_response->getBody()); + $this->assertXPath('//ul[@id="allItems"]/li[@id="FORMATIONS_WIDGET"]//a[contains(@href, "admin/widget/edit-widget")]'); }