Task #100949 - Add number type field and params bug fix

punambaravkar · Mar 25, 2017 · 2e91472 · 2e91472
1 parent ac698d4
commit 2e91472
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/admin_language/en-GB/en-GB.com_tjfields.ini b/admin_language/en-GB/en-GB.com_tjfields.ini
@@ -133,6 +133,12 @@ COM_TJFIELDS_FORM_DESC_EDITOR_HEIGHT="Default Value"
 COM_TJFIELDS_FORM_LBL_FIELD_SIZE="Size"
 COM_TJFIELDS_FORM_DESC_FIELD_SIZE="Set size"
 COM_TJFIELDS_FORM_LBL_FIELD_MAXLENGTH="Max Length"
+COM_TJFIELDS_FORM_LBL_FIELD_MIN="Min Value"
+COM_TJFIELDS_FORM_DESC_FIELD_MIN="Min Value"
+COM_TJFIELDS_FORM_LBL_FIELD_MAX="Max Value"
+COM_TJFIELDS_FORM_DESC_FIELD_MAX="Max Value"
+COM_TJFIELDS_FORM_LBL_FIELD_STEP="Step Value"
+COM_TJFIELDS_FORM_DESC_FIELD_STEP="Step Value"
 COM_TJFIELDS_FORM_DESC_FIELD_MAXLENGTH="Set max length"
 COM_TJFIELDS_FORM_LBL_FIELD_DEFAULT="Default Value"
 COM_TJFIELDS_FORM_DESC_FIELD_DEFAULT="Set default value"
@@ -204,6 +210,7 @@ COM_TJFIELDS_NO="No"
 COM_TJFIELDS_YES="Yes"
 COMTJFILEDS_FIELD_CREATED_SUCCESSFULLY="Field created successfully"
 COMTJFILEDS_GROUP_CREATED_SUCCESSFULLY="Group created successfully"
+COM_TJFIELDS_NUMBER="Number"
 
 ; Since 1.1 - Aug 2014
 ; Countries list

diff --git a/administrator/helpers/tjfields.php b/administrator/helpers/tjfields.php
@@ -316,7 +316,10 @@ public function createXml($data, $fields, $category = null)
 
 					foreach ($fieldAttribute as $attribute => $fieldparam)
 					{
-						$field->addAttribute($attribute, $fieldparam);
+						if (!empty($fieldparam))
+						{
+							$field->addAttribute($attribute, $fieldparam);
+						}
 					}
 				}
 

diff --git a/administrator/models/forms/field.xml b/administrator/models/forms/field.xml
@@ -20,6 +20,7 @@
 			<option value="file">COM_TJFIELDS_FILE</option>
 			<option value="spacer">COM_TJFIELDS_SPACER</option>
 			<option value="subform">COM_TJFIELDS_SUBFORM</option>
+			<option value="number">COM_TJFIELDS_NUMBER</option>
 		</field>
 		<field name="fieldoption" type="fieldoption" label="COM_TJFIELDS_FORM_LBL_FIELD_OPTION" description="COM_TJFIELDS_FORM_DESC_FIELD_OPTION" required="false" />
 		<field name="filter_field_type" type="list" onchange="this.form.submit();">
@@ -37,6 +38,7 @@
 			<option value="user">COM_TJFIELDS_USERS</option>
 			<option value="file">COM_TJFIELDS_FILE</option>
 			<option value="subform">COM_TJFIELDS_SUBFORM</option>
+			<option value="number">COM_TJFIELDS_NUMBER</option>
 		</field>
 		<field name="required" type="radio" label="COM_TJFIELDS_FORM_LBL_FIELD_REQUIRED" description="COM_TJFIELDS_FORM_DESC_FIELD_REQUIRED" default="0" required="true" class="btn-group">
 			<option value="1">COM_TJFIELDS_YES</option>

diff --git a/administrator/models/forms/types/forms/number.xml b/administrator/models/forms/types/forms/number.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params" label="COM_TJFIELDS_FIELD_BASIC_LABEL">
+		<fieldset name="params">
+			<field name="default" type="text" label="COM_TJFIELDS_FORM_LBL_FIELD_DEFAULT" description="COM_TJFIELDS_FORM_DESC_FIELD_DEFAULT"/>
+			<field name="min" type="number" label="COM_TJFIELDS_FORM_LBL_FIELD_MIN" description="COM_TJFIELDS_FORM_DESC_FIELD_MIN"/>
+			<field name="max" type="number" label="COM_TJFIELDS_FORM_LBL_FIELD_MAX" description="COM_TJFIELDS_FORM_DESC_FIELD_MAX"/>
+			<field name="step" type="number" label="COM_TJFIELDS_FORM_LBL_FIELD_STEP" description="COM_TJFIELDS_FORM_DESC_FIELD_STEP"/>
+		</fieldset>
+	</fields>
+</form>