Fixed issue #6723: Survey does not deactivate properly on MSSQL

LimeSurvey · Oct 18, 2012 · 6d7f4f0 · 6d7f4f0
1 parent 194f04f
commit 6d7f4f0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -133,9 +133,10 @@ public function rules()
         array('tokenlength','numerical', 'integerOnly'=>true,'allowEmpty'=>true),                 
         array('bouncetime','numerical', 'integerOnly'=>true,'allowEmpty'=>true),                 
         array('navigationdelay','numerical', 'integerOnly'=>true,'allowEmpty'=>true),                     
-        array('expires','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),   
-        array('startdate','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),
-		array('datecreated','date', 'format'=>'yyyy-MM-dd', 'allowEmpty'=>true),    
+      //  array('expires','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),   
+      //  array('startdate','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),
+	  //	array('datecreated','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),    
+      // Date rules currently don't work properly with MSSQL, deactivating for now
         array('template', 'tmplfilter'),
         );
     }

diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php
@@ -81,8 +81,9 @@ public function rules()
 		array('usesleft','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
 		array('mpid','numerical', 'integerOnly'=>true,'allowEmpty'=>true), 	
 		array('blacklisted', 'in','range'=>array('Y','N'), 'allowEmpty'=>true), 
-        array('validfrom','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),   
-        array('validuntil','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),             			 
+//        array('validfrom','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),   
+//        array('validuntil','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true),             			 
+// Date rules currently don't work properly with MSSQL, deactivating for now
 		);  
 	}	
 

diff --git a/styles/gringegreen/images/quality_assurance.png b/styles/gringegreen/images/quality_assurance.png