* Alle : Isolation : ZV_FM-1993 : Fix Store-Zuweisung

Author: Hanmac

app/code/local/Egovs/Isolation/Block/Adminhtml/Permissions/User/Edit/Tabs.php

@@ -11,26 +11,18 @@
  */
 class Egovs_Isolation_Block_Adminhtml_Permissions_User_Edit_Tabs extends Mage_Adminhtml_Block_Permissions_User_Edit_Tabs
 {
-
-   
-
     protected function _beforeToHtml()
     {
-    	
-    	$user = Mage::registry('permissions_user');
-    	$r = $user->getRole();
-    	if($user->getRole()->getId() != 1)
-    	{
-	        $this->addTabAfter('user_section', array(
-	            'label'     => Mage::helper('adminhtml')->__('Stores'),
-	            'title'     => Mage::helper('adminhtml')->__('Stores'),
-	            'content'   => $this->getLayout()->createBlock('isolation/adminhtml_permissions_user_edit_tabs_store')->toHtml(),
-	            
-	        ),'roles_section');
+        $user = Mage::registry('permissions_user');
+
+        if(!Mage::helper('isolation')->isAdmin($user)) {
+            $this->addTabAfter('user_section', array(
+                'label'     => Mage::helper('adminhtml')->__('Stores'),
+                'title'     => Mage::helper('adminhtml')->__('Stores'),
+                'content'   => $this->getLayout()->createBlock('isolation/adminhtml_permissions_user_edit_tabs_store')->toHtml(),
+            ),'roles_section');
+        }
 
-    	}
-    
         return parent::_beforeToHtml();
     }
-
 }

app/code/local/Egovs/Isolation/Helper/Data.php

@@ -22,14 +22,16 @@ public function getUserStoreGroups()
 		$user = Mage::getSingleton('admin/session')->getUser();
 		return $user->getStoreGroups();
 	}
-	
+
 	public function getUserIsAdmin()
 	{
-		$user = Mage::getSingleton('admin/session')->getUser();	
-		return ($user->getRole()->getId() == 1);
+		return $this->isAdmin(Mage::getSingleton('admin/session')->getUser());
 	}
-	
-	
+
+	public function isAdmin($user) {
+	    return ($user->getRole()->getId() == 1);
+	}
+
 	public function getUsername($id)
 	{
 		$user = Mage::getModel('admin/user')->load($id);

app/code/local/Egovs/Isolation/Model/Observer/User.php

@@ -20,7 +20,7 @@ public function onUserSave($observer)
     		$stores = $user->getStoreGroups();
     		Mage::getModel('isolation/relation')->removeAllStoreRelations($user->getId());
 
-            if(!Mage::helper('isolation')->getUserIsAdmin()) {
+            if(!Mage::helper('isolation')->isAdmin($user)) {
                 if (is_array($stores)) {
                     foreach ($stores as $store) {
                         $store_relation = Mage::getModel('isolation/relation');