Changeset 15682 for trunk/templates

Timestamp:

11/17/11 03:43:50 (6 months ago)

Author:

Alexander Trofimov

Message:

Grid - fixes + new webforms and jQuery

Location:

trunk/templates/base

Files:

• grid.html (modified) (1 diff)
• scripts/BxBaseGrid.php (modified) (8 diffs)

trunk/templates/base/grid.html

@@ -70 +70 @@
                 start: __start__,
                 per_page: __per_page__,
+                filter: '__filter__',
+                order_field: '__order_field__',
+                order_dir: '__order_dir__',
+                text_search_input: '<bx_text_js:_sys_grid_search />',
                 columns: __columns__
             });
-            glGrids.__object__.setSearchInputText ('<bx_text_js:_sys_grid_search />');            
         }
     });

trunk/templates/base/scripts/BxBaseGrid.php

@@ -30 +30 @@
         require_once(BX_DIRECTORY_PATH_INC . "params.inc.php");
         require_once(BX_DIRECTORY_PATH_INC . "design.inc.php");
-
-        $oParser = new Services_JSON();
-        echo $oParser->encode(array (
-            //'popup' => false, //  TODO:
+        
+        $this->_echoResultJson(array (
             'grid' => $this->getCode(false),
         ));
@@ -44 +42 @@
             $this->_updateOrder($mixedId, ++$iOrder);
 
-        $oParser = new Services_JSON();
-        echo $oParser->encode(array());
-    }
-
-    public function performActionDelete() {
-                
-        $oParser = new Services_JSON();
+        $this->_echoResultJson(array());
+    }
+
+    public function performActionDelete() {            
 
         $iAffected = 0;
         $aIds = bx_get('ids');
         if (!$aIds || !is_array($aIds)) {
-            echo $oParser->encode(array());
+            $this->_echoResultJson(array());
             exit;
         }
@@ -62 +57 @@
             $iAffected += $this->_delete($mixedId) ? 1 : 0;
 
-        echo $oParser->encode(array(
-            'msg' => $iAffected > 0 ? _t("_sys_grid_n_rows_were_successfully deleted", $iAffected) : _t("_sys_grid_delete_failed"), 
+        echo $this->_echoResultJson(array(
+            'msg' => $iAffected > 0 ? _t("_sys_grid_n_rows_were_successfully_deleted", $iAffected) : _t("_sys_grid_delete_failed"), 
             'grid' => $this->getCode(false),
         ));
@@ -98 +93 @@
             $aData = $this->_getData ($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage + 1);
 
+            $sPageUrl = false;
+            if (!empty($this->_aOptions['paginate_url'])) {
+
+                $sPageUrl = $this->_aOptions['paginate_url'];
+
+                $aParamsAppend = array();
+                if ($sFilter) {
+                    $aParamsAppend['filter'] = bx_process_input(bx_get('filter'));
+                }
+                if ($sOrderField) {
+                    $aParamsAppend['order_field'] = bx_process_input(bx_get('order_field'));
+                    $aParamsAppend['order_dir'] = bx_process_input(bx_get('order_dir'));
+                }
+                if ($aParamsAppend)
+                    $sPageUrl = bx_append_url_params($sPageUrl, $aParamsAppend);                
+            }
+
             $aPaginateParams = array(
                 'start' => $iStart,
                 'per_page' => $iPerPage,
-                'page_url' => !empty($this->_aOptions['paginate_url']) ? $this->_aOptions['paginate_url'] : "javascript:glGrids." . $this->_sObject . ".reload('{start}'); void(0);",
+                'page_url' =>  $sPageUrl ? $sPageUrl : "javascript:glGrids." . $this->_sObject . ".reload('{start}'); void(0);",
             );
 
@@ -135 +147 @@
             'start' => $iStart,
             'per_page' => $iPerPage,
+            'filter' => bx_js_string($sFilter, BX_JS_STR_APOS),
+            'order_field' => bx_js_string($sOrderField, BX_JS_STR_APOS),
+            'order_dir' => bx_js_string($sOrderDir, BX_JS_STR_APOS),
             'columns' => count($this->_aOptions['fields']),
             'bx_if:actions_bulk' => array (
@@ -160 +175 @@
             ),
         );
-        
-        $sRet = $this->_oTemplate->parseHtmlByName('grid.html', $aVars);
-
-        if ($this->_aOptions['field_order']) {
-            $this->_oTemplate->addJs(array(
-                'jquery.ui.core.min.js',
-                'jquery.ui.widget.min.js',
-                'jquery.ui.mouse.min.js',
-                'jquery.ui.sortable.min.js',                
-            ));
-        } 
-
-        $this->_oTemplate->addJs('BxDolGrid.js');
-        $this->_oTemplate->addCss('grid.css');
-        $this->_oTemplate->addJsTranslation('_sys_grid_confirmation');
-
-        return $sRet;
+
+        $this->_addJsCss();
+        
+        return $this->_oTemplate->parseHtmlByName('grid.html', $aVars);
     }
 
@@ -318 +320 @@
         // TODO: don't duplicate code here, get it form forms somehow
         $this->_oTemplate->addCss('forms.css');
-        $sSearchAttr = bx_html_attribute(_t('_sys_grid_search'));
         return '
             <div class="bx-form-input-wrapper bx-form-input-wrapper-text">
-                <input id="bx-grid-search-' . $this->_sObject . '" class="bx-def-font-inputs bx-form-input-text" type="text" name="keyword" value="' . $sSearchAttr . '" />
+                <input id="bx-grid-search-' . $this->_sObject . '" class="bx-def-font-inputs bx-form-input-text" type="text" name="keyword" value="" />
             </div>';
     }
@@ -349 +350 @@
         return $oDb->query($sQuery);
     }
+
+    protected function _addJsCss() {
+
+        if ($this->_aOptions['field_order']) {
+            $this->_oTemplate->addJs(array(
+                'jquery.ui.core.min.js',
+                'jquery.ui.widget.min.js',
+                'jquery.ui.mouse.min.js',
+                'jquery.ui.sortable.min.js',                
+            ));
+        } 
+
+        $this->_oTemplate->addJs('BxDolGrid.js');
+        $this->_oTemplate->addCss('grid.css');
+
+        $this->_oTemplate->addJsTranslation('_sys_grid_confirmation');
+    }
+
+    protected function _echoResultJson($a, $isAutoWrapForFormFileSubmit = false) {
+
+        header('Content-type: text/html; charset=utf-8');    
+
+        require_once(BX_DIRECTORY_PATH_PLUGINS . 'Services_JSON.php');
+
+        $oParser = new Services_JSON();
+        $s = $oParser->encode($a);
+        if ($isAutoWrapForFormFileSubmit && !empty($_FILES)) 
+            $s = '<textarea>' . $s . '</textarea>'; // http://jquery.malsup.com/form/#file-upload
+        echo $s;
+    }
 }