Changeset 15682 for trunk/inc

Timestamp:

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

Author:

Alexander Trofimov

Message:

Grid - fixes + new webforms and jQuery

Location:

trunk/inc

Files:

• classes/BxDolForm.php (modified) (3 diffs)
• js/classes/BxDolGrid.js (modified) (3 diffs)
• utils.inc.php (modified) (1 diff)

trunk/inc/classes/BxDolForm.php

@@ -175 +175 @@
     }
 
-    function insert ($aValsToAdd = array()) {
+    function insert ($aValsToAdd = array(), $isIgnore = false) {
         $oChecker = new BxDolFormChecker($this->_sCheckerHelper);
         $oChecker->setFormMethod($this->aFormAttrs['method']);
-        $sSql = $oChecker->dbInsert($this->aParams['db'], $this->aInputs, $aValsToAdd);
+        $sSql = $oChecker->dbInsert($this->aParams['db'], $this->aInputs, $aValsToAdd, $isIgnore);
         if (!$sSql) return false;
         if (db_res ($sSql))
@@ -434 +434 @@
         foreach ($aInputs as $k => $a) {
             if (!isset ($a['db'])) continue;
-            $valClean = $this->get ($a['name'], $a['db']['pass'], $a['db']['params'] ? $a['db']['params'] : array());
+            $valClean = $this->get ($a['name'], $a['db']['pass'], !empty($a['db']['params']) ? $a['db']['params'] : array());
             $s .= $oDb->prepare("`{$a['name']}` = ?,", $valClean);
             $aInputs[$k]['db']['value'] = $valClean;
@@ -444 +444 @@
     }
 
-    function dbInsert (&$aDb, &$aInputs, $aValsToAdd = array()) {
+    function dbInsert (&$aDb, &$aInputs, $aValsToAdd = array(), $isIgnore = false) {
         if (!$aDb['table']) return '';
         $sFields = $this->serializeDbValues ($aInputs, $aValsToAdd);
         if (!$sFields) return '';
-        return "INSERT INTO `{$aDb['table']}` SET $sFields";
+        return "INSERT " . ($isIgnore ? 'IGNORE' : '') . " INTO `{$aDb['table']}` SET $sFields";
     }
 

trunk/inc/js/classes/BxDolGrid.js

@@ -11 +11 @@
     this._sIdTable = 'bx-grid-table-' + sObject;
     this._oOptions = oOptions;
-    this._sFilter = '';
-    this._sOrderField = '';
-    this._sOrderDir = 'ASC';
-    this._sSearchInputText = '';
+    this._sFilter = undefined == oOptions.filter ? '' : oOptions.filter;
+    this._sOrderField = undefined == oOptions.order_field ? '' : oOptions.order_field;
+    this._sOrderDir = undefined == oOptions.order_dir ? 'ASC' : oOptions.order_dir;
+    this._sSearchInputText = undefined == oOptions.text_search_input ? '' : oOptions.text_search_input;
+    this._oPopupOptions = {};
+
+    if (this._sFilter.length)
+        this._sSearchInputText = this._sFilter;
+
+    $('#bx-grid-search-' + this._sObject).val(this._sSearchInputText);
 
     this._onDataReloaded();
-}
-
-BxDolGrid.prototype.setSearchInputText = function (sText) {
-    this._sSearchInputText = sText;
+
+    if (this._sOrderField.length)
+        this.setSorting (this._sOrderField, this._sOrderDir, true);
 }
 
@@ -173 +178 @@
 
     if (typeof(isDisableLoading) == 'undefined' || !isDisableLoading)
-        bx_loading(this._sIdContainer, true);
+        this.loading(true);
 
     $.getJSON(sUrl, function (oData) {
-
-        if (typeof(isDisableLoading) == 'undefined' || !isDisableLoading)
-            bx_loading($this._sIdContainer, false);
-
-        if (oData && undefined != oData.grid) {
-            $('#' + $this._sIdContainer).html(oData.grid);
-            $this._onDataReloaded(true);
-        }
-        if (oData && undefined != oData.msg) {
-            alert(oData.msg);
-        }
-        if (oData && undefined != oData.popup) {
-            alert('TODO: popup');
-        }
-
-    });
-
+        $this.processJson(oData, sAction, isDisableLoading);
+    });
+
+}
+
+BxDolGrid.prototype.processJson = function (oData, sAction, isDisableLoading) {
+    if (typeof(isDisableLoading) == 'undefined' || !isDisableLoading)
+        this.loading(false);
+
+    if (oData && undefined != oData.grid) {
+        $('#' + this._sIdContainer).html(oData.grid);
+        this._onDataReloaded(true);
+    }
+    if (oData && undefined != oData.msg) {
+        alert(oData.msg);
+    }
+    if (oData && undefined != oData.blink) {
+        if ('object' == typeof(oData.blink)) {
+            for(var i in oData.blink)
+                this.blink(this._sObject + '_row_' + oData.blink[i]);
+        } else {
+            this.blink(this._sObject + '_row_' + oData.blink);
+        }
+    }
+    if (oData && undefined != oData.popup) {
+        var sId = 'grid-popup-' + this._sObject + '-' + sAction;
+        $('#' + sId).remove();
+        $('<div id="' + sId + '" style="display: none;"></div>').prependTo('body').html(oData.popup);
+        $('#' + sId).dolPopup(this._oPopupOptions);
+    }
+}
+
+BxDolGrid.prototype.loading = function (bShow) {
+    bx_loading(this._sIdContainer, bShow);
 }
 
@@ -236 +258 @@
         var sAction = $(this).attr('bx_grid_action_independent');
         var sActionConfirm = $(this).attr('bx_grid_action_confirm');
-        $this.action (sActionData, sAction, {}, '', false, sActionConfirm);
+        $this.action (sAction, {}, '', false, sActionConfirm);
     });
 

trunk/inc/utils.inc.php

@@ -1135 +1135 @@
 }
 
-function bx_append_url_params ($sUrl, $aParams) {
+function bx_append_url_params ($sUrl, $mixedParams) {
     $sParams = false == strpos($sUrl, '?') ? '?' : '&';
-    foreach($aParams as $sKey => $sValue)
-        $sParams .= $sKey . '=' . $sValue . '&';
-    $sParams = substr($sParams, 0, -1);
+        
+    if (is_array($mixedParams)) {
+        foreach($mixedParams as $sKey => $sValue)
+            $sParams .= $sKey . '=' . $sValue . '&';
+        $sParams = substr($sParams, 0, -1);
+    } else {
+        $sParams .= $mixedParams;
+    }    
     return $sUrl . $sParams;
 }