Skip to content

Commit 3d193ed

Browse files
sreichelkiatng
sreichel
and
kiatng
authored
Fixed active menu (#4209)
Co-authored-by: Ng Kiat Siong <[email protected]>
1 parent bdcfba4 commit 3d193ed

File tree

29 files changed

+49
-40
lines changed

29 files changed

+49
-40
lines changed

‎app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function preDispatch()
4141
protected function _initAction()
4242
{
4343
$this->loadLayout();
44-
$this->_setActiveMenu('system/services/roles');
44+
$this->_setActiveMenu('system/api/roles');
4545
$this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
4646
$this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
4747
$this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));

‎app/code/core/Mage/Adminhtml/controllers/Api/UserController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function preDispatch()
3939
protected function _initAction()
4040
{
4141
$this->loadLayout()
42-
->_setActiveMenu('system/services/users')
42+
->_setActiveMenu('system/api/users')
4343
->_addBreadcrumb($this->__('Web Services'), $this->__('Web Services'))
4444
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
4545
->_addBreadcrumb($this->__('Users'), $this->__('Users'))

‎app/code/core/Mage/Adminhtml/controllers/CustomerController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function editAction()
155155
/**
156156
* Set active menu item
157157
*/
158-
$this->_setActiveMenu('customer/new');
158+
$this->_setActiveMenu('customer/manage');
159159

160160
$this->renderLayout();
161161
}

‎app/code/core/Mage/Adminhtml/controllers/NotificationController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function indexAction()
2626
$this->_title($this->__('System'))->_title($this->__('Notifications'));
2727

2828
$this->loadLayout()
29-
->_setActiveMenu('system/notification')
29+
->_setActiveMenu('system/adminnotification')
3030
->_addBreadcrumb(Mage::helper('adminnotification')->__('Messages Inbox'), Mage::helper('adminhtml')->__('Messages Inbox'))
3131
->_addContent($this->getLayout()->createBlock('adminhtml/notification_inbox'))
3232
->renderLayout();

‎app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Mage_Adminhtml_Permissions_BlockController extends Mage_Adminhtml_Controll
3333
protected function _initAction()
3434
{
3535
$this->loadLayout()
36-
->_setActiveMenu('system/acl')
36+
->_setActiveMenu('system/acl/blocks')
3737
->_addBreadcrumb($this->__('System'), $this->__('System'))
3838
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
3939
->_addBreadcrumb($this->__('Blocks'), $this->__('Blocks'));

‎app/code/core/Mage/Adminhtml/controllers/Permissions/OrphanedResourceController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Mage_Adminhtml_Permissions_OrphanedResourceController extends Mage_Adminht
2828
protected function _initAction()
2929
{
3030
$this->loadLayout()
31-
->_setActiveMenu('system/acl')
31+
->_setActiveMenu('system/acl/orphaned_resources')
3232
->_addBreadcrumb($this->__('System'), $this->__('System'))
3333
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
3434
->_addBreadcrumb($this->__('Orphaned Resources'), $this->__('Orphaned Role Resources'));

‎app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function preDispatch()
4646
protected function _initAction()
4747
{
4848
$this->loadLayout();
49-
$this->_setActiveMenu('system/acl');
49+
$this->_setActiveMenu('system/acl/roles');
5050
$this->_addBreadcrumb($this->__('System'), $this->__('System'));
5151
$this->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'));
5252
$this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));

‎app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function preDispatch()
3939
protected function _initAction()
4040
{
4141
$this->loadLayout()
42-
->_setActiveMenu('system/acl')
42+
->_setActiveMenu('system/acl/users')
4343
->_addBreadcrumb($this->__('System'), $this->__('System'))
4444
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
4545
->_addBreadcrumb($this->__('Users'), $this->__('Users'))

‎app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Mage_Adminhtml_Permissions_VariableController extends Mage_Adminhtml_Contr
3333
protected function _initAction()
3434
{
3535
$this->loadLayout()
36-
->_setActiveMenu('system/acl')
36+
->_setActiveMenu('system/acl/variables')
3737
->_addBreadcrumb($this->__('System'), $this->__('System'))
3838
->_addBreadcrumb($this->__('Permissions'), $this->__('Permissions'))
3939
->_addBreadcrumb($this->__('Variables'), $this->__('Variables'));

‎app/code/core/Mage/Adminhtml/controllers/Report/CustomerController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function accountsAction()
4242
->_title($this->__('New Accounts'));
4343

4444
$this->_initAction()
45-
->_setActiveMenu('report/customer/accounts')
45+
->_setActiveMenu('report/customers/accounts')
4646
->_addBreadcrumb(Mage::helper('adminhtml')->__('New Accounts'), Mage::helper('adminhtml')->__('New Accounts'))
4747
->_addContent($this->getLayout()->createBlock('adminhtml/report_customer_accounts'))
4848
->renderLayout();
@@ -79,7 +79,7 @@ public function ordersAction()
7979
->_title($this->__('Customers by Number of Orders'));
8080

8181
$this->_initAction()
82-
->_setActiveMenu('report/customer/orders')
82+
->_setActiveMenu('report/customers/orders')
8383
->_addBreadcrumb(
8484
Mage::helper('reports')->__('Customers by Number of Orders'),
8585
Mage::helper('reports')->__('Customers by Number of Orders')
@@ -119,7 +119,7 @@ public function totalsAction()
119119
->_title($this->__('Customers by Orders Total'));
120120

121121
$this->_initAction()
122-
->_setActiveMenu('report/customer/totals')
122+
->_setActiveMenu('report/customers/totals')
123123
->_addBreadcrumb(
124124
Mage::helper('reports')->__('Customers by Orders Total'),
125125
Mage::helper('reports')->__('Customers by Orders Total')

‎app/code/core/Mage/Adminhtml/controllers/Report/ProductController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function soldAction()
7373
->_title($this->__('Products Ordered'));
7474

7575
$this->_initAction()
76-
->_setActiveMenu('report/product/sold')
76+
->_setActiveMenu('report/products/sold')
7777
->_addBreadcrumb(Mage::helper('reports')->__('Products Ordered'), Mage::helper('reports')->__('Products Ordered'))
7878
->_addContent($this->getLayout()->createBlock('adminhtml/report_product_sold'))
7979
->renderLayout();
@@ -161,7 +161,7 @@ public function lowstockAction()
161161
->_title($this->__('Low Stock'));
162162

163163
$this->_initAction()
164-
->_setActiveMenu('report/product/lowstock')
164+
->_setActiveMenu('report/products/lowstock')
165165
->_addBreadcrumb(Mage::helper('reports')->__('Low Stock'), Mage::helper('reports')->__('Low Stock'))
166166
->_addContent($this->getLayout()->createBlock('adminhtml/report_product_lowstock'))
167167
->renderLayout();
@@ -203,7 +203,7 @@ public function downloadsAction()
203203
->_title($this->__('Downloads'));
204204

205205
$this->_initAction()
206-
->_setActiveMenu('report/product/downloads')
206+
->_setActiveMenu('report/products/downloads')
207207
->_addBreadcrumb(Mage::helper('reports')->__('Downloads'), Mage::helper('reports')->__('Downloads'))
208208
->_addContent($this->getLayout()->createBlock('adminhtml/report_product_downloads'))
209209
->renderLayout();

‎app/code/core/Mage/Adminhtml/controllers/Report/SalesController.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function salesAction()
4040
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_ORDER_FLAG_CODE, 'sales');
4141

4242
$this->_initAction()
43-
->_setActiveMenu('report/sales/sales')
43+
->_setActiveMenu('report/salesroot/sales')
4444
->_addBreadcrumb(Mage::helper('adminhtml')->__('Sales Report'), Mage::helper('adminhtml')->__('Sales Report'));
4545

4646
$gridBlock = $this->getLayout()->getBlock('report_sales_sales.grid');
@@ -159,7 +159,7 @@ public function taxAction()
159159
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_TAX_FLAG_CODE, 'tax');
160160

161161
$this->_initAction()
162-
->_setActiveMenu('report/sales/tax')
162+
->_setActiveMenu('report/salesroot/tax')
163163
->_addBreadcrumb(Mage::helper('adminhtml')->__('Tax'), Mage::helper('adminhtml')->__('Tax'));
164164

165165
$gridBlock = $this->getLayout()->getBlock('report_sales_tax.grid');
@@ -202,7 +202,7 @@ public function shippingAction()
202202
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_SHIPPING_FLAG_CODE, 'shipping');
203203

204204
$this->_initAction()
205-
->_setActiveMenu('report/sales/shipping')
205+
->_setActiveMenu('report/salesroot/shipping')
206206
->_addBreadcrumb(Mage::helper('adminhtml')->__('Shipping'), Mage::helper('adminhtml')->__('Shipping'));
207207

208208
$gridBlock = $this->getLayout()->getBlock('report_sales_shipping.grid');
@@ -245,7 +245,7 @@ public function invoicedAction()
245245
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_INVOICE_FLAG_CODE, 'invoiced');
246246

247247
$this->_initAction()
248-
->_setActiveMenu('report/sales/invoiced')
248+
->_setActiveMenu('report/salesroot/invoiced')
249249
->_addBreadcrumb(Mage::helper('adminhtml')->__('Total Invoiced'), Mage::helper('adminhtml')->__('Total Invoiced'));
250250

251251
$gridBlock = $this->getLayout()->getBlock('report_sales_invoiced.grid');
@@ -288,7 +288,7 @@ public function refundedAction()
288288
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_REFUNDED_FLAG_CODE, 'refunded');
289289

290290
$this->_initAction()
291-
->_setActiveMenu('report/sales/refunded')
291+
->_setActiveMenu('report/salesroot/refunded')
292292
->_addBreadcrumb(Mage::helper('adminhtml')->__('Total Refunded'), Mage::helper('adminhtml')->__('Total Refunded'));
293293

294294
$gridBlock = $this->getLayout()->getBlock('report_sales_refunded.grid');
@@ -331,7 +331,7 @@ public function couponsAction()
331331
$this->_showLastExecutionTime(Mage_Reports_Model_Flag::REPORT_COUPONS_FLAG_CODE, 'coupons');
332332

333333
$this->_initAction()
334-
->_setActiveMenu('report/sales/coupons')
334+
->_setActiveMenu('report/salesroot/coupons')
335335
->_addBreadcrumb(Mage::helper('adminhtml')->__('Coupons'), Mage::helper('adminhtml')->__('Coupons'));
336336

337337
$gridBlock = $this->getLayout()->getBlock('report_sales_coupons.grid');

‎app/code/core/Mage/Adminhtml/controllers/Sales/Order/StatusController.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected function _initStatus()
5757
public function indexAction()
5858
{
5959
$this->_title($this->__('Sales'))->_title($this->__('Order Statuses'));
60-
$this->loadLayout()->_setActiveMenu('system')->renderLayout();
60+
$this->loadLayout()->_setActiveMenu('system/order_statuses')->renderLayout();
6161
}
6262

6363
/**
@@ -73,6 +73,7 @@ public function newAction()
7373
}
7474
$this->_title($this->__('Sales'))->_title($this->__('Create New Order Status'));
7575
$this->loadLayout()
76+
->_setActiveMenu('system/order_statuses')
7677
->renderLayout();
7778
}
7879

@@ -86,6 +87,7 @@ public function editAction()
8687
Mage::register('current_status', $status);
8788
$this->_title($this->__('Sales'))->_title($this->__('Edit Order Status'));
8889
$this->loadLayout()
90+
->_setActiveMenu('system/order_statuses')
8991
->renderLayout();
9092
} else {
9193
$this->_getSession()->addError(
@@ -161,6 +163,7 @@ public function assignAction()
161163
{
162164
$this->_title($this->__('Sales'))->_title($this->__('Assign Order Status to State'));
163165
$this->loadLayout()
166+
->_setActiveMenu('system/order_statuses')
164167
->renderLayout();
165168
}
166169

‎app/code/core/Mage/Adminhtml/controllers/System/AccountController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function indexAction()
3232
$this->_title($this->__('System'))->_title($this->__('My Account'));
3333

3434
$this->loadLayout();
35-
$this->_setActiveMenu('system/account');
35+
$this->_setActiveMenu('system/myaccount');
3636
$this->_addContent($this->getLayout()->createBlock('adminhtml/system_account_edit'));
3737
$this->renderLayout();
3838
}

‎app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function indexAction()
4747
/**
4848
* Set active menu item
4949
*/
50-
$this->_setActiveMenu('system/convert');
50+
$this->_setActiveMenu('system/convert/gui');
5151

5252
/**
5353
* Append profiles block to content
@@ -89,7 +89,7 @@ public function editAction()
8989

9090
$this->_title($profile->getId() ? $profile->getName() : $this->__('New Profile'));
9191

92-
$this->_setActiveMenu('system/convert');
92+
$this->_setActiveMenu('system/convert/gui');
9393

9494
$this->_addContent(
9595
$this->getLayout()->createBlock('adminhtml/system_convert_gui_edit')

‎app/code/core/Mage/Adminhtml/controllers/System/Convert/ProfileController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function indexAction()
7171
/**
7272
* Set active menu item
7373
*/
74-
$this->_setActiveMenu('system/convert');
74+
$this->_setActiveMenu('system/convert/profiles');
7575

7676
/**
7777
* Append profiles block to content
@@ -121,7 +121,7 @@ public function editAction()
121121

122122
$this->_title($profile->getId() ? $profile->getName() : $this->__('New Profile'));
123123

124-
$this->_setActiveMenu('system/convert');
124+
$this->_setActiveMenu('system/convert/profiles');
125125

126126
$this->_addContent(
127127
$this->getLayout()->createBlock('adminhtml/system_convert_profile_edit')

‎app/code/core/Mage/Adminhtml/controllers/System/CurrencyController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function indexAction()
5050
$this->_title($this->__('System'))->_title($this->__('Manage Currency Rates'));
5151

5252
$this->loadLayout();
53-
$this->_setActiveMenu('system/currency');
53+
$this->_setActiveMenu('system/currency/rates');
5454
$this->_addContent($this->getLayout()->createBlock('adminhtml/system_currency'));
5555
$this->renderLayout();
5656
}

‎app/code/core/Mage/Adminhtml/controllers/System/DesignController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function indexAction()
4141
$this->_title($this->__('System'))->_title($this->__('Design'));
4242

4343
$this->loadLayout();
44-
$this->_setActiveMenu('system');
44+
$this->_setActiveMenu('system/design');
4545
$this->_addContent($this->getLayout()->createBlock('adminhtml/system_design'));
4646
$this->renderLayout();
4747
}
@@ -61,7 +61,7 @@ public function editAction()
6161
$this->_title($this->__('System'))->_title($this->__('Design'));
6262

6363
$this->loadLayout();
64-
$this->_setActiveMenu('system');
64+
$this->_setActiveMenu('system/design');
6565
$this->getLayout()->getBlock('head')->setCanLoadExtJs(true);
6666

6767
$id = (int) $this->getRequest()->getParam('id');

‎app/code/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function indexAction()
4747
->_title($this->__('Web Services'))
4848
->_title($this->__('REST Attributes'));
4949

50-
$this->loadLayout()->_setActiveMenu('system/services/attributes');
50+
$this->loadLayout()->_setActiveMenu('system/api/rest_attributes');
5151

5252
$this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'))
5353
->_addBreadcrumb($this->__('REST Attributes'), $this->__('REST Attributes'))
@@ -62,7 +62,7 @@ public function indexAction()
6262
public function editAction()
6363
{
6464
$this->loadLayout()
65-
->_setActiveMenu('system/services/attributes');
65+
->_setActiveMenu('system/api/rest_attributes');
6666

6767
$type = $this->getRequest()->getParam('type');
6868

‎app/code/core/Mage/Api2/controllers/Adminhtml/Api2/RoleController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function indexAction()
4141
->_title($this->__('Web Services'))
4242
->_title($this->__('REST Roles'));
4343

44-
$this->loadLayout()->_setActiveMenu('system/services/roles');
44+
$this->loadLayout()->_setActiveMenu('system/api/rest_roles');
4545
$this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
4646
$this->_addBreadcrumb($this->__('REST Roles'), $this->__('REST Roles'));
4747
$this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));
@@ -82,7 +82,7 @@ public function newAction()
8282
->_title($this->__('Web Services'))
8383
->_title($this->__('Rest Roles'));
8484

85-
$this->loadLayout()->_setActiveMenu('system/services/roles');
85+
$this->loadLayout()->_setActiveMenu('system/api/rest_roles');
8686
$this->_addBreadcrumb($this->__('Web services'), $this->__('Web services'));
8787
$this->_addBreadcrumb($this->__('REST Roles'), $this->__('REST Roles'));
8888
$this->_addBreadcrumb($this->__('Roles'), $this->__('Roles'));

‎app/code/core/Mage/CurrencySymbol/controllers/Adminhtml/System/CurrencysymbolController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function indexAction()
3434
{
3535
// set active menu and breadcrumbs
3636
$this->loadLayout()
37-
->_setActiveMenu('system/currency')
37+
->_setActiveMenu('system/currency/symbols')
3838
->_addBreadcrumb(
3939
Mage::helper('currencysymbol')->__('System'),
4040
Mage::helper('currencysymbol')->__('System')

‎app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected function _initAction()
4545
{
4646
$this->_title($this->__('Import/Export'))
4747
->loadLayout()
48-
->_setActiveMenu('system/importexport');
48+
->_setActiveMenu('system/convert/export');
4949

5050
return $this;
5151
}

‎app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected function _initAction()
4545
{
4646
$this->_title($this->__('Import/Export'))
4747
->loadLayout()
48-
->_setActiveMenu('system/importexport');
48+
->_setActiveMenu('system/convert/import');
4949

5050
return $this;
5151
}

‎app/code/core/Mage/Index/controllers/Adminhtml/ProcessController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public function editAction()
7171

7272
Mage::register('current_index_process', $process);
7373
$this->loadLayout();
74+
$this->_setActiveMenu('system/index');
7475
$this->renderLayout();
7576
} else {
7677
$this->_getSession()->addError(

‎app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public function preDispatch()
4343
public function indexAction()
4444
{
4545
$this->loadLayout();
46+
$this->_setActiveMenu('system/api/oauth_admin_token');
4647
$this->renderLayout();
4748
}
4849

‎app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public function preDispatch()
4040
*/
4141
public function indexAction()
4242
{
43-
$this->loadLayout()->_setActiveMenu('system/oauth');
43+
$this->loadLayout();
44+
$this->_setActiveMenu('system/api/oauth_authorized_tokens');
4445
$this->renderLayout();
4546
}
4647

0 commit comments

Comments
 (0)