Changeset 15881

Timestamp:

01/16/12 06:34:02 (4 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2734

Location:

tags/7.0

Files:

• inc/classes/BxDolTwigModule.php (modified) (4 diffs)
• inc/classes/BxDolTwigSearchResult.php (modified) (1 diff)
• modules/boonex/events/classes/BxEventsModule.php (modified) (2 diffs)
• modules/boonex/groups/classes/BxGroupsModule.php (modified) (2 diffs)
• modules/boonex/store/classes/BxStoreModule.php (modified) (2 diffs)

tags/7.0/inc/classes/BxDolTwigModule.php

@@ -1105 +1105 @@
     }
 
-    function _actionAdministrationManage ($isAdminEntries, $sKeyBtnDelete, $sKeyBtnActivate) {
+    function _actionAdministrationManage ($isAdminEntries, $sKeyBtnDelete, $sKeyBtnActivate, $sUrl = false) {
 
         if ($_POST['action_activate'] && is_array($_POST['entry'])) {
@@ -1132 +1132 @@
             $sContent = $this->_manageEntries ('admin', '', true, 'bx_twig_admin_form', array(
                 'action_delete' => $sKeyBtnDelete,
-            ));
+            ), '', true, 0, $sUrl);
         } else {
             $sContent = $this->_manageEntries ('pending', '', true, 'bx_twig_admin_form', array(
                 'action_activate' => $sKeyBtnActivate,
                 'action_delete' => $sKeyBtnDelete,
-            ));
+            ), '', true, 0, $sUrl);
         }
             
@@ -1328 +1328 @@
     }
 
-    function _manageEntries ($sMode, $sValue, $isFilter, $sFormName, $aButtons, $sAjaxPaginationBlockId = '', $isMsgBoxIfEmpty = true, $iPerPage = 0) {
+    function _manageEntries ($sMode, $sValue, $isFilter, $sFormName, $aButtons, $sAjaxPaginationBlockId = '', $isMsgBoxIfEmpty = true, $iPerPage = 0, $sUrlAdmin = false) {
 
         bx_import ('SearchResult', $this->_aModule);
@@ -1347 +1347 @@
                 return '';
         } else {
-            $sPagination = $sAjaxPaginationBlockId ? $o->showPaginationAjax($sAjaxPaginationBlockId) : $o->showPagination();
+            $sPagination = $sAjaxPaginationBlockId ? $o->showPaginationAjax($sAjaxPaginationBlockId) : $o->showPagination($sUrlAdmin);
             $sActionsPanel = $o->showAdminActionsPanel ($sFormName, $aButtons);
         }

tags/7.0/inc/classes/BxDolTwigSearchResult.php

@@ -50 +50 @@
     }
 
-    function showPagination($bAdmin = false) {
+    function showPagination($sUrlAdmin = false) {
 
         $oMain = $this->getMain();
         $oConfig = $oMain->_oConfig;
         bx_import('BxDolPaginate');
-        $sUrlStart = BX_DOL_URL_ROOT . $oConfig->getBaseUri() . $this->sBrowseUrl;
+        $sUrlStart = BX_DOL_URL_ROOT . $oConfig->getBaseUri() . ($sUrlAdmin ? $sUrlAdmin : $this->sBrowseUrl);
         $sUrlStart .= (false === strpos($sUrlStart, '?') ? '?' : '&');
 

tags/7.0/modules/boonex/events/classes/BxEventsModule.php

@@ -544 +544 @@
                 'title' => _t('_bx_events_pending_approval'), 
                 'href' => BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'administration/home', 
-                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(false)),
+                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(false, 'administration/home')),
             ),
             'admin_entries' => array(
                 'title' => _t('_bx_events_administration_admin_events'), 
                 'href' => BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'administration/admin_entries',
-                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(true)),
+                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(true, 'administration/admin_entries')),
             ),            
             'create' => array(
@@ -583 +583 @@
     }
 
-    function actionAdministrationManage ($isAdminEntries = false) {
-        return parent::_actionAdministrationManage ($isAdminEntries, '_bx_events_admin_delete', '_bx_events_admin_activate');
+    function actionAdministrationManage ($isAdminEntries = false, $sUrl = '') {
+        return parent::_actionAdministrationManage ($isAdminEntries, '_bx_events_admin_delete', '_bx_events_admin_activate', $sUrl);
     }
 

tags/7.0/modules/boonex/groups/classes/BxGroupsModule.php

@@ -433 +433 @@
                 'title' => _t('_bx_groups_menu_admin_pending_approval'), 
                 'href' => BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'administration/pending_approval', 
-                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(false)),
+                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(false, 'administration/pending_approval')),
             ),
             'admin_entries' => array(
                 'title' => _t('_bx_groups_menu_admin_entries'), 
                 'href' => BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'administration/admin_entries',
-                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(true)),
+                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(true, 'administration/admin_entries')),
             ),            
             'create' => array(
@@ -471 +471 @@
     }
 
-    function actionAdministrationManage ($isAdminEntries = false) {
-        return parent::_actionAdministrationManage ($isAdminEntries, '_bx_groups_admin_delete', '_bx_groups_admin_activate');
+    function actionAdministrationManage ($isAdminEntries = false, $sUrl = '') {
+        return parent::_actionAdministrationManage ($isAdminEntries, '_bx_groups_admin_delete', '_bx_groups_admin_activate', $sUrl);
     }
 

tags/7.0/modules/boonex/store/classes/BxStoreModule.php

@@ -433 +433 @@
                 'title' => _t('_bx_store_menu_admin_pending_approval'), 
                 'href' => BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'administration/pending_approval', 
-                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(false)),
+                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(false, 'administration/pending_approval')),
             ),
             'admin_entries' => array(
                 'title' => _t('_bx_store_menu_admin_entries'), 
                 'href' => BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri() . 'administration/admin_entries',
-                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(true)),
+                '_func' => array ('name' => 'actionAdministrationManage', 'params' => array(true, 'administration/admin_entries')),
             ),            
             'create' => array(
@@ -471 +471 @@
     }
 
-    function actionAdministrationManage ($isAdminEntries = false) {
-        return parent::_actionAdministrationManage ($isAdminEntries, '_bx_store_admin_delete', '_bx_store_admin_activate');
+    function actionAdministrationManage ($isAdminEntries = false, $sUrl = '') {
+        return parent::_actionAdministrationManage ($isAdminEntries, '_bx_store_admin_delete', '_bx_store_admin_activate', $sUrl);
     }