Merge branch '0.8.9' of https://github.com/mage-eag/mage-enhanced-adm…

…in-grids into 0.8.9
mwgamble · May 16, 2013 · c7634ac · c7634ac
2 parents b9ae095 + d644ebc
commit c7634ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/code/community/BL/CustomGrid/Model/Grid/Type/Tax/Class.php b/app/code/community/BL/CustomGrid/Model/Grid/Type/Tax/Class.php
@@ -35,8 +35,8 @@ public function canExport($type)
     public function checkUserEditPermissions($type, $model, $block=null, $params=array())
     {
         if (parent::checkUserEditPermissions($type, $model, $block, $params)) {
-            if (!is_null($grid)) {
-                $classType = $grid->getClassType();
+            if (!is_null($block)) {
+                $classType = $block->getClassType();
             } elseif (isset($params['additional']['class_type'])) {
                 $classType = $params['additional']['class_type'];
             } else {

diff --git a/js/bl/customgrid/config.js b/js/bl/customgrid/config.js
@@ -2078,4 +2078,4 @@ blcg.Filter.Categories.prototype = {
             blcg.Tools.closeDialog(this.window);
         }
     }
-}
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -2078,4 +2078,4 @@ blcg.Filter.Categories.prototype = { @@
                 blcg.Tools.closeDialog(this.window);
             }
         }
-    }
+    };