squash to: Add Mage_Customer EAV grids

OpenMage · Jul 15, 2022 · 7434768 · 7434768
1 parent 8ba5e82
commit 7434768
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 72 deletions.
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Address/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Address/AttributeController.php
@@ -51,19 +51,24 @@ protected function _initAction()
 
  $this->_title($this->__('Customers'))
  ->_title($this->__('Attributes'))
- ->_title($this->__('Address'))
- ->_title($this->__('Attributes'));
+ ->_title($this->__('Manage Customer Address Attributes'));
 
- $this->_setActiveMenu('customers/attributes')
+ $this->_setActiveMenu('customer/attributes')
  ->_addBreadcrumb(
  $this->__('Customers'),
  $this->__('Customers')
  )
  ->_addBreadcrumb(
- $this->__('Attributes'),
- $this->__('Attributes')
+ $this->__('Manage Customer Address Attributes'),
+ $this->__('Manage Customer Address Attributes')
  );
 
  return $this;
  }
+
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed('customer/attributes/customer_address_attributes');
+ }
+
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/Address/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/Address/SetController.php
@@ -51,20 +51,24 @@ protected function _initAction()
 
  $this->_title($this->__('Customers'))
  ->_title($this->__('Attributes'))
- ->_title($this->__('Address'))
- ->_title($this->__('Sets'));
+ ->_title($this->__('Manage Customer Address Attribute Sets'));
 
- $this->_setActiveMenu('customers/attributes')
+ $this->_setActiveMenu('customer/attributes')
  ->_addBreadcrumb(
  $this->__('Customers'),
  $this->__('Customers')
  )
  ->_addBreadcrumb(
- $this->__('Attributes'),
- $this->__('Attributes')
+ $this->__('Manage Customer Address Attribute Sets'),
+ $this->__('Manage Customer Address Attribute Sets')
  );
 
  return $this;
  }
 
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed('customer/attributes/customer_address_sets');
+ }
+
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/AttributeController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/AttributeController.php
@@ -51,19 +51,24 @@ protected function _initAction()
 
  $this->_title($this->__('Customers'))
  ->_title($this->__('Attributes'))
- ->_title($this->__('Customer'))
- ->_title($this->__('Attributes'));
+ ->_title($this->__('Manage Customer Attributes'));
 
- $this->_setActiveMenu('customers/attributes')
+ $this->_setActiveMenu('customer/attributes')
  ->_addBreadcrumb(
  $this->__('Customers'),
  $this->__('Customers')
  )
  ->_addBreadcrumb(
- $this->__('Attributes'),
- $this->__('Attributes')
+ $this->__('Manage Customer Attributes'),
+ $this->__('Manage Customer Attributes')
  );
 
  return $this;
  }
+
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed('customer/attributes/customer_attributes');
+ }
+
 }
diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/SetController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/SetController.php
@@ -51,20 +51,24 @@ protected function _initAction()
 
  $this->_title($this->__('Customers'))
  ->_title($this->__('Attributes'))
- ->_title($this->__('Customer'))
- ->_title($this->__('Sets'));
+ ->_title($this->__('Manage Customer Attribute Sets'));
 
- $this->_setActiveMenu('customers/attributes')
+ $this->_setActiveMenu('customer/attributes')
  ->_addBreadcrumb(
  $this->__('Customers'),
  $this->__('Customers')
  )
  ->_addBreadcrumb(
- $this->__('Attributes'),
- $this->__('Attributes')
+ $this->__('Manage Customer Attribute Sets'),
+ $this->__('Manage Customer Attribute Sets')
  );
 
  return $this;
  }
 
+ protected function _isAllowed()
+ {
+ return Mage::getSingleton('admin/session')->isAllowed('customer/attributes/customer_sets');
+ }
+
 }
diff --git a/app/code/core/Mage/Customer/etc/adminhtml.xml b/app/code/core/Mage/Customer/etc/adminhtml.xml
@@ -44,32 +44,22 @@
  <attributes translate="title" module="customer">
  <title>Attributes</title>
  <children>
- <customer translate="title" module="customer">
- <title>Customers</title>
- <children>
- <attributes translate="title" module="customer">
- <title>Attributes</title>
- <action>adminhtml/customer_attribute/</action>
- </attributes>
- <sets translate="title" module="customer">
- <title>Attribute Sets</title>
- <action>adminhtml/customer_set/</action>
- </sets>
- </children>
- </customer>
- <customer_address translate="title" module="customer">
- <title>Customer Address</title>
- <children>
- <attributes translate="title" module="customer">
- <title>Attributes</title>
- <action>adminhtml/customer_address_attribute/</action>
- </attributes>
- <sets translate="title" module="customer">
- <title>Attribute Sets</title>
- <action>adminhtml/customer_address_set/</action>
- </sets>
- </children>
- </customer_address>
+ <customer_attributes translate="title" module="customer">
+ <title>Manage Customer Attributes</title>
+ <action>adminhtml/customer_attribute/</action>
+ </customer_attributes>
+ <customer_sets translate="title" module="customer">
+ <title>Manage Customer Attribute Sets</title>
+ <action>adminhtml/customer_set/</action>
+ </customer_sets>
+ <customer_address_attributes translate="title" module="customer">
+ <title>Manage Customer Address Attributes</title>
+ <action>adminhtml/customer_address_attribute/</action>
+ </customer_address_attributes>
+ <customer_address_sets translate="title" module="customer">
+ <title>Manage Customer Address Attribute Sets</title>
+ <action>adminhtml/customer_address_set/</action>
+ </customer_address_sets>
  </children>
  <sort_order>20</sort_order>
  </attributes>
@@ -100,32 +90,18 @@
  <attributes translate="title">
  <title>Attributes</title>
  <children>
- <customer translate="title">
- <title>Customers</title>
- <children>
- <attributes translate="title">
- <title>Attributes</title>
- <eav>eav/customer/attributes</eav>
- </attributes>
- <sets translate="title">
- <title>Attribute Sets</title>
- <eav>eav/customer/sets</eav>
- </sets>
- </children>
- </customer>
- <customer_address translate="title">
- <title>Customer Address</title>
- <children>
- <attributes translate="title">
- <title>Attributes</title>
- <eav>eav/customer_address/attributes</eav>
- </attributes>
- <sets translate="title">
- <title>Attribute Sets</title>
- <eav>eav/customer_address/sets</eav>
- </sets>
- </children>
- </customer_address>
+ <customer_attributes translate="title">
+ <title>Manage Customer Attributes</title>
+ </customer_attributes>
+ <customer_sets translate="title">
+ <title>Manage Customer Attribute Sets</title>
+ </customer_sets>
+ <customer_address_attributes translate="title">
+ <title>Manage Customer Address Attributes</title>
+ </customer_address_attributes>
+ <customer_address_sets translate="title">
+ <title>Manage Customer Address Attribute Sets</title>
+ </customer_address_sets>
  </children>
  </attributes>
  <online translate="title">