Merge pull request #3 from rmenor/master

Repair Issue 45
mishamx · May 26, 2012 · dabeffa · dabeffa
2 parents df6f74e + 78a1b13
commit dabeffa
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/controllers/ProfileFieldController.php b/controllers/ProfileFieldController.php
@@ -133,12 +133,21 @@ public function registerScript() {
 			'FLOAT':{
 				'hide':['match','other_validator','widgetparams'],
 				'val':{
-					'field_size':'10,2',
+					'field_size':'10.2',
 					'default':'0.00',
 					'range':'',
 					'widgetparams':''
 				}
 			},
+			'DECIMAL':{
+				'hide':['match','other_validator','widgetparams'],
+				'val':{
+					'field_size':'10,2',
+					'default':'0',
+					'range':'',
+					'widgetparams':''
+				}
+			},
 			'BOOL':{
 				'hide':['field_size','field_size_min','match','widgetparams'],
 				'val':{

diff --git a/data/schema.mysql.sql b/data/schema.mysql.sql
@@ -30,8 +30,8 @@ CREATE TABLE `tbl_profiles_fields` (
   `varname` varchar(50) NOT NULL,
   `title` varchar(255) NOT NULL,
   `field_type` varchar(50) NOT NULL,
-  `field_size` int(3) NOT NULL DEFAULT '0',
-  `field_size_min` int(3) NOT NULL DEFAULT '0',
+  `field_size` varchar(15) NOT NULL DEFAULT '0',
+  `field_size_min` varchar(15) NOT NULL DEFAULT '0',
   `required` int(1) NOT NULL DEFAULT '0',
   `match` varchar(255) NOT NULL DEFAULT '',
   `range` varchar(255) NOT NULL DEFAULT '',

diff --git a/models/Profile.php b/models/Profile.php
@@ -37,7 +37,9 @@ public function rules()
 	{
 		if (!$this->_rules) {
 			$required = array();
-			$numerical = array();		
+			$numerical = array();
+			$float = array();		
+			$decimal = array();
 			$rules = array();
 
 			$model=$this->getFields();
@@ -46,7 +48,11 @@ public function rules()
 				$field_rule = array();
 				if ($field->required==ProfileField::REQUIRED_YES_NOT_SHOW_REG||$field->required==ProfileField::REQUIRED_YES_SHOW_REG)
 					array_push($required,$field->varname);
-				if ($field->field_type=='FLOAT'||$field->field_type=='INTEGER')
+				if ($field->field_type=='FLOAT')
+					array_push($float,$field->varname);
+				if ($field->field_type=='DECIMAL')
+					array_push($decimal,$field->varname);
+				if ($field->field_type=='INTEGER')
 					array_push($numerical,$field->varname);
 				if ($field->field_type=='VARCHAR'||$field->field_type=='TEXT') {
 					$field_rule = array($field->varname, 'length', 'max'=>$field->field_size, 'min' => $field->field_size_min);
@@ -86,6 +92,8 @@ public function rules()
 
 			array_push($rules,array(implode(',',$required), 'required'));
 			array_push($rules,array(implode(',',$numerical), 'numerical', 'integerOnly'=>true));
+			array_push($rules,array(implode(',',$float), 'type', 'type'=>'float'));
+			array_push($rules,array(implode(',',$decimal), 'match', 'pattern' => '/^\s*[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\s*$/'));
 			$this->_rules = $rules;
 		}
 		return $this->_rules;

diff --git a/models/ProfileField.php b/models/ProfileField.php
@@ -59,7 +59,8 @@ public function rules()
 			array('varname', 'match', 'pattern' => '/^[A-Za-z_0-9]+$/u','message' => UserModule::t("Variable name may consist of A-z, 0-9, underscores, begin with a letter.")),
 			array('varname', 'unique', 'message' => UserModule::t("This field already exists.")),
 			array('varname, field_type', 'length', 'max'=>50),
-			array('field_size, field_size_min, required, position, visible', 'numerical', 'integerOnly'=>true),
+			array('field_size_min, required, position, visible', 'numerical', 'integerOnly'=>true),
+			array('field_size', 'match', 'pattern' => '/^\s*[-+]?[0-9]*\,*\.?[0-9]+([eE][-+]?[0-9]+)?\s*$/'),
 			array('title, match, error_message, other_validator, default, widget', 'length', 'max'=>255),
 			array('range, widgetparams', 'length', 'max'=>5000),
 			array('id, varname, title, field_type, field_size, field_size_min, required, match, range, error_message, other_validator, default, widget, widgetparams, position, visible', 'safe', 'on'=>'search'),
@@ -181,6 +182,7 @@ public static function itemAlias($type,$code=NULL) {
 				'TEXT'=> UserModule::t('TEXT'),
 				'DATE'=> UserModule::t('DATE'),
 				'FLOAT'=> UserModule::t('FLOAT'),
+				'DECIMAL'=> UserModule::t('DECIMAL'),
 				'BOOL'=> UserModule::t('BOOL'),
 				'BLOB'=> UserModule::t('BLOB'),
 				'BINARY'=> UserModule::t('BINARY'),

diff --git a/models/User.php b/models/User.php
@@ -98,7 +98,7 @@ public function attributeLabels()
 			'activkey' => UserModule::t("activation key"),
 			'createtime' => UserModule::t("Registration date"),
 			'create_at' => UserModule::t("Registration date"),
-			'lastvisit' => UserModule::t("Last visit"),
+
 			'lastvisit_at' => UserModule::t("Last visit"),
 			'superuser' => UserModule::t("Superuser"),
 			'status' => UserModule::t("Status"),