hotline#33533_avis_disfonctionnement_affichage_des_boites_accordeon_sur_validation :

fix rt : refacto dupli

VERSIONS_HOTLINE/33533

- - ticket #33533 : Administration : Moderation d'avis : correction disfonctionnement affichage des boites accordeon sur validation
\ No newline at end of file
+ - ticket #33533 : Administration: correction de la navigation dans la modération des avis
\ No newline at end of file

application/modules/admin/controllers/ModoController.php

@@ -114,14 +114,8 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
   }
 
   public function editavisnoticeAction() {
-    $status = $this->_request->getParam('status', 0);
-    $active_tab = $this->_request->getParam('active_tab', 1);
-    $page = $this->_request->getParam('page', 0);
-
-    $redirect = 'admin/modo/avisnotice/status/' . $status . '/active_tab/' . $active_tab . '/page/' . $page;
-
     if (!$avis = Class_AvisNotice::find((int)$this->_request->getParam('id'))) {
-      $this->_redirect($redirect);
+      $this->_redirectToAvisNotice();
       return;
     }
 
@@ -130,7 +124,7 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
       ->addPermalinkFor($avis);
 
     if ($this->_editavisnoticePost($form, $avis)) {
-      $this->_redirect($redirect);
+      $this->_redirectToAvisNotice();
       return;
     }
 
@@ -160,18 +154,26 @@ class Admin_ModoController extends ZendAfi_Controller_Action {
 
   public function validateavisnoticeAction() {
     $id = $this->_request->getParam('id');
-    $page = $this->_request->getParam('page', 0);
-    $active_tab = $this->_request->getParam('active_tab', 1);
-    $status = $this->_request->getParam('status', 0);
 
     Class_AvisNotice::find($id)
       ->setModerationOK()
       ->save();
 
-    $this->_redirect('/admin/modo/avisnotice/status/' . $status . '/active_tab/' . $active_tab . '/page/' . $page);
+    $this->_redirectToAvisNotice();
   }
 
 
+  protected function _redirectToAvisNotice() {
+    $page = $this->_request->getParam('page', 0);
+    $active_tab = $this->_request->getParam('active_tab', 1);
+    $status = $this->_request->getParam('status', 0);
+
+    $this->_redirect('/admin/modo/avisnotice/status/' . $status .
+                     '/active_tab/' . $active_tab .
+                     '/page/' . $page);
+
+  }
+
   public function deleteCmsAvisAction() {
     $avis = Class_Avis::find($this->_getParam('id'));
     $avis->delete();