Changeset 15727 for trunk/templates
- Timestamp:
- 12/06/11 22:25:16 (6 months ago)
- Location:
- trunk/templates/base
- Files:
-
- 2 edited
-
grid.html (modified) (1 diff)
-
scripts/BxBaseGrid.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/templates/base/grid.html
r15711 r15727 81 81 order_dir: '__order_dir__', 82 82 text_search_input: '<bx_text_js:_sys_grid_search />', 83 popup_options: __popup_options__, 83 84 columns: __columns__ 84 85 }); -
trunk/templates/base/scripts/BxBaseGrid.php
r15724 r15727 18 18 19 19 protected $_oTemplate; 20 protected $_aPopupOptions = false; 20 21 21 22 public function __construct ($aOptions, $oTemplate) { … … 152 153 $aData = $this->_getData ($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage); 153 154 155 } 156 157 $sPopupOptions = '{}'; 158 if (!empty($this->_aPopupOptions) && is_array($this->_aPopupOptions)) { 159 require_once(BX_DIRECTORY_PATH_PLUGINS . 'Services_JSON.php'); 160 $oParser = new Services_JSON(); 161 $sPopupOptions = $oParser->encode($this->_aPopupOptions); 154 162 } 155 163 … … 173 181 'order_field' => bx_js_string($sOrderField, BX_JS_STR_APOS), 174 182 'order_dir' => bx_js_string($sOrderDir, BX_JS_STR_APOS), 183 'popup_options' => $sPopupOptions, 175 184 'columns' => count($this->_aOptions['fields']), 176 185 'bx_if:actions_bulk' => array (
Note: See TracChangeset
for help on using the changeset viewer.