Changeset 15980

Timestamp:

02/13/12 02:55:25 (3 months ago)

Author:

Anton Lesnikov

Message:

1. Minor fixes and improvements.
2. Issue with JavaScript? off in Grids -> Filter panel.

Location:

trunk/studio

Files:

• js/permissions_prices.js (modified) (1 diff)
• templates/base/scripts/BxBaseStudioFormsDisplays.php (modified) (1 diff)
• templates/base/scripts/BxBaseStudioFormsForms.php (modified) (1 diff)
• templates/base/scripts/BxBaseStudioNavigationImport.php (modified) (1 diff)
• templates/base/scripts/BxBaseStudioNavigationItems.php (modified) (1 diff)
• templates/base/scripts/BxBaseStudioNavigationMenus.php (modified) (1 diff)
• templates/base/scripts/BxBaseStudioNavigationSets.php (modified) (1 diff)
• templates/base/scripts/BxBaseStudioPermissionsActions.php (modified) (2 diffs)
• templates/base/scripts/BxBaseStudioPermissionsPrices.php (modified) (1 diff)

trunk/studio/js/permissions_prices.js

@@ -19 +19 @@
 
 BxDolStudioPermissionsPrices.prototype.onChangeLevel = function() {
-    var iLevel = parseInt($('#bx-grid-level-' + this.sObjNameGrid).val());
+    var iLevel = parseInt($('#bx-grid-level-' + this.sObjNameGrid).val().replace('id-', ''));
     document.location.href = this.sPageUrl + (iLevel > 0 ? '&level=' + iLevel : ''); 
 };

trunk/studio/templates/base/scripts/BxBaseStudioFormsDisplays.php

@@ -234 +234 @@
             'attrs' => array(
                 'id' => 'bx-grid-search-' . $this->_sObject,
-                'onKeyup' => 'javascript:$(this).off(); ' . $this->getJsObject() . '.onChangeFilter()' 
+                'onKeyup' => 'javascript:$(this).off(\'keyup\'); ' . $this->getJsObject() . '.onChangeFilter()' 
             )
         );

trunk/studio/templates/base/scripts/BxBaseStudioFormsForms.php

@@ -208 +208 @@
             'attrs' => array(
                 'id' => 'bx-grid-search-' . $this->_sObject,
-                'onKeyup' => 'javascript:$(this).off(); ' . $this->getJsObject() . '.onChangeFilter()' 
+                'onKeyup' => 'javascript:$(this).off(\'keyup\'); ' . $this->getJsObject() . '.onChangeFilter()' 
             )
         );

trunk/studio/templates/base/scripts/BxBaseStudioNavigationImport.php

@@ -185 +185 @@
             'attrs' => array(
                 'id' => 'bx-grid-search-' . $this->_sObject,
-                'onKeyup' => 'javascript:$(this).off(); ' . $this->getJsObject() . '.onChangeFilter()' 
+                'onKeyup' => 'javascript:$(this).off(\'keyup\'); ' . $this->getJsObject() . '.onChangeFilter()' 
             )
         );

trunk/studio/templates/base/scripts/BxBaseStudioNavigationItems.php

@@ -778 +778 @@
             'attrs' => array(
                 'id' => 'bx-grid-search-' . $this->_sObject,
-                'onKeyup' => 'javascript:$(this).off(); ' . $this->getJsObject() . '.onChangeFilter()' 
+                'onKeyup' => 'javascript:$(this).off(\'keyup\'); ' . $this->getJsObject() . '.onChangeFilter()' 
             )
         );

trunk/studio/templates/base/scripts/BxBaseStudioNavigationMenus.php

@@ -549 +549 @@
             'attrs' => array(
                 'id' => 'bx-grid-search-' . $this->_sObject,
-                'onKeyup' => 'javascript:$(this).off(); ' . $this->getJsObject() . '.onChangeFilter()' 
+                'onKeyup' => 'javascript:$(this).off(\'keyup\'); ' . $this->getJsObject() . '.onChangeFilter()' 
             )
         );

trunk/studio/templates/base/scripts/BxBaseStudioNavigationSets.php

@@ -362 +362 @@
             'attrs' => array(
                 'id' => 'bx-grid-search-' . $this->_sObject,
-                'onKeyup' => 'javascript:$(this).off(); ' . $this->getJsObject() . '.onChangeFilter()' 
+                'onKeyup' => 'javascript:$(this).off(\'keyup\'); ' . $this->getJsObject() . '.onChangeFilter()' 
             )
         );

trunk/studio/templates/base/scripts/BxBaseStudioPermissionsActions.php

@@ -262 +262 @@
                 'onChange' => 'javascript:' . $this->getJsObject() . '.onChangeLevel()'
             ),
-            'value' => $this->iLevel,
+            'value' => 'id-' . $this->iLevel,
             'values' => array()
         );
@@ -299 +299 @@
             'attrs' => array(
                 'id' => 'bx-grid-search-' . $this->_sObject,
-                'onKeyup' => 'javascript:$(this).off(); ' . $this->getJsObject() . '.onChangeFilter()' 
+                'onKeyup' => 'javascript:$(this).off(\'keyup\'); ' . $this->getJsObject() . '.onChangeFilter()' 
             )
         );

trunk/studio/templates/base/scripts/BxBaseStudioPermissionsPrices.php

@@ -329 +329 @@
                 'onChange' => 'javascript:' . $this->getJsObject() . '.onChangeLevel()'
             ),
-            'value' => $this->iLevel,
+            'value' => 'id-' . $this->iLevel,
             'values' => array()
         );