Changeset 15793 for trunk/inc

Timestamp:

12/22/11 00:15:32 (5 months ago)

Author:

Alexander Trofimov

Message:

Form objects

Location:

trunk/inc

Files:

• classes/BxDolForm.php (modified) (7 diffs)
• js/jquery.webForms.js (modified) (1 diff)

trunk/inc/classes/BxDolForm.php

@@ -118 +118 @@
     var $_sCheckerHelper;
     var $_aSpecificValues;
-    
+  
     var $aFormAttrs;
     var $aTableAttrs;
@@ -144 +144 @@
         // set default method
         if (!isset($this->aFormAttrs['method']))
-            $this->aFormAttrs['method'] = BX_DOL_FORM_METHOD_GET;
+            $this->aFormAttrs['method'] = BX_DOL_FORM_METHOD_POST;
 
         // set default action
@@ -153 +153 @@
 
         BxDolForm::genCsrfToken();
+    }
+
+    /**
+     * Get form object instance by object name
+     * @param $sObject object name
+     * @return object instance or false on error
+     */
+    static public function getObjectInstance($sObject, $sDisplayName) {
+
+        if (isset($GLOBALS['bxDolClasses']['BxDolForm!'.$sObject.'!'.$sDisplayName]))
+            return $GLOBALS['bxDolClasses']['BxDolForm!'.$sObject.'!'.$sDisplayName];
+        
+        bx_import('BxDolFormQuery');
+        $aObject = BxDolFormQuery::getFormArray($sObject, $sDisplayName);
+        if (!$aObject || !is_array($aObject))
+            return false;
+
+        bx_import('BxTemplFormView');
+        $sClass = 'BxTemplFormView';
+        if (!empty($aObject['override_class_name'])) {            
+            $sClass = $aObject['override_class_name'];            
+            if (!empty($aObject['override_class_file']))
+                require_once(BX_DIRECTORY_PATH_ROOT . $aObject['override_class_file']);
+            else    
+                bx_import($sClass);
+        }
+        
+        $o = new $sClass($aObject);
+
+        return ($GLOBALS['bxDolClasses']['BxDolForm!'.$sObject.'!'.$sDisplayName] = $o);
     }
 
@@ -378 +408 @@
 
             if (!isset ($a['checker']))  {
-                if ('checkbox' == $a['type'])
+                if ('checkbox' == $a['type'] || 'switcher' == $a['type'])
                     $aInputs[$k]['checked'] = ($aInputs[$k]['value'] == $val);
                 else
@@ -474 +504 @@
         foreach ($aInputs as $k => $a) {
             if (!isset($aValues[$k])) continue;
-            $sMethod = 'display' . (isset($a['db']['pass']) ? ucfirst($a['db']['pass']) : 'Undefined');
-            if (method_exists($this->_oChecker, $sMethod))
-                $aInputs[$k]['value'] = call_user_func_array (array($this->_oChecker, $sMethod), $a['db']['params'] ? array_merge(array($aValues[$k]), $a['db']['params']) : array ($aValues[$k]));
-            else
-                $aInputs[$k]['value'] = $aValues[$k];
-
-            if ($a['type'] == 'select_box')
-                $aInputs[$k]['value'] = explode (';', $aInputs[$k]['value']);
+
+            if ('checkbox' == $aInputs[$k]['type'] || 'switcher' == $aInputs[$k]['type']) {
+                $aInputs[$k]['checked'] = ($aInputs[$k]['value'] == $aValues[$k]);
+            } else {
+                $sMethod = 'display' . (isset($a['db']['pass']) ? ucfirst($a['db']['pass']) : 'Undefined');
+                if (method_exists($this->_oChecker, $sMethod))
+                    $aInputs[$k]['value'] = call_user_func_array (array($this->_oChecker, $sMethod), !empty($a['db']['params']) ? array_merge(array($aValues[$k]), $a['db']['params']) : array ($aValues[$k]));
+                else
+                    $aInputs[$k]['value'] = $aValues[$k];
+            }
         }
     }
@@ -680 +712 @@
     }
 
+    function passSet ($s) {
+        if (is_array($s)) {
+            $i = array ();
+            foreach ($s as $k => $v) {
+                $i |= (int)trim($v);
+            }
+            return $i;
+        }
+        return (int)$s;
+    }
+
     // display functions, prepare values to output to the screen
 
@@ -687 +730 @@
     function displayDateTime ($i) {
         return bx_process_output ($i, BX_DATA_DATETIME_TS);
+    }
+    function displaySet ($i) {
+        $bit = 1;
+        $a = array();
+        while ($bit < PHP_INT_MAX && $bit > 0) {
+            if ($bit & $i)
+                $a[] = $bit;
+            $bit <<= 1;
+        }
+        return $a;
     }
 

trunk/inc/js/jquery.webForms.js

@@ -217 +217 @@
 
             // DateTime picker
-            else if(this.getAttribute("type") == "datetime") {
+            else if ($(this).parents().filter('.bx-form-input-wrapper-datetime').length > 0) {
 
                 if ($(this).hasClass('bx-form-datetime-processed'))