Changeset 15744 for trunk/templates
- Timestamp:
- 12/09/11 21:11:46 (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
r15727 r15744 82 82 text_search_input: '<bx_text_js:_sys_grid_search />', 83 83 popup_options: __popup_options__, 84 query_append: __query_append__, 84 85 columns: __columns__ 85 86 }); -
trunk/templates/base/scripts/BxBaseGrid.php
r15736 r15744 19 19 protected $_oTemplate; 20 20 protected $_aPopupOptions = false; 21 protected $_aQueryAppend = false; 21 22 22 23 public function __construct ($aOptions, $oTemplate) { … … 160 161 $oParser = new Services_JSON(); 161 162 $sPopupOptions = $oParser->encode($this->_aPopupOptions); 163 } 164 165 $sQueryAppend = '{}'; 166 if (!empty($this->_aQueryAppend) && is_array($this->_aQueryAppend)) { 167 require_once(BX_DIRECTORY_PATH_PLUGINS . 'Services_JSON.php'); 168 $oParser = new Services_JSON(); 169 $sQueryAppend = $oParser->encode($this->_aQueryAppend); 162 170 } 163 171 … … 182 190 'order_dir' => bx_js_string($sOrderDir, BX_JS_STR_APOS), 183 191 'popup_options' => $sPopupOptions, 192 'query_append' => $sQueryAppend, 184 193 'columns' => count($this->_aOptions['fields']), 185 194 'bx_if:actions_bulk' => array (
Note: See TracChangeset
for help on using the changeset viewer.