Changeset 15790

Timestamp:

12/20/11 01:57:26 (5 months ago)

Author:

Alexander Trofimov

Message:

Forms - datetime field fix

Location:

trunk

Files:

• inc/utils.inc.php (modified) (1 diff)
• plugins/jquery/jquery.dynDateTime.js (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioPermissionsActions.php (modified) (1 diff)

trunk/inc/utils.inc.php

@@ -220 +220 @@
         return $iRet > 0 ? $iRet : false;
     case BX_DATA_DATETIME_TS:
-        if (!preg_match('#(\d+)\-(\d+)\-(\d+)[\sT]{1}(\d+):(\d+):(\d+)#', $s, $m))
+        if (!preg_match('#(\d+)\-(\d+)\-(\d+)[\sT]{1}(\d+):(\d+):(\d+)#', $mixedData, $m))
             return bx_process_input ($mixedData, BX_DATA_DATE_TS, $mixedParams, $isCheckMagicQuotes);
         $iDay   = $m[3];

trunk/plugins/jquery/jquery.dynDateTime.js

@@ -948 +948 @@
         div.style.position = this.opts.position_css;
         div.style.display = "none";
+        div.style.zIndex = 10001;
     }
     div.appendChild(table);

trunk/studio/templates/base/scripts/BxBaseStudioPermissionsActions.php

@@ -121 +121 @@
                 ),
                 'AllowedPeriodStart' => array(
-                    'type' => 'datepicker',
+                    'type' => 'datetime',
                     'name' => 'AllowedPeriodStart',
                     'caption' => _t('_adm_prm_txt_actions_avail_start'),
                     'info' => _t('_adm_prm_dsc_actions_avail'),
                     'value' => $aOption['allowed_period_start'],
-                    'display' => 'filterDate',
                     'attrs' => array( 
                         'allow_input' => 'true', 
                     ),
                     'db' => array (
-                        'pass' => 'Date',
+                        'pass' => 'Xss',
                     ), 
                 ),
                 'AllowedPeriodEnd' => array(
-                    'type' => 'datepicker',
+                    'type' => 'datetime',
                     'name' => 'AllowedPeriodEnd',
                     'caption' => _t('_adm_prm_txt_actions_avail_end'),
                     'info' => _t('_adm_prm_dsc_actions_avail'),
                     'value' => $aOption['allowed_period_end'],
-                    'display' => 'filterDate',
                     'attrs' => array( 
                         'allow_input' => 'true', 
                     ),
                     'db' => array (
-                        'pass' => 'Date',
+                        'pass' => 'Xss',
                     ),
                 ),