0000634: Remove "la_EmptyValue" phrase - In-Portal Issue Tracker

Index: admin_templates/custom_fields/custom_fields_edit.tpl =================================================================== --- admin_templates/custom_fields/custom_fields_edit.tpl (revision 13268) +++ admin_templates/custom_fields/custom_fields_edit.tpl (working copy) @@ -69,7 +69,7 @@ <inp2:m_RenderElement name="inp_edit_checkbox" prefix="cf" field="OnGeneralTab" title="!la_prompt_showgeneraltab!"/> <inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Heading" title="!la_prompt_heading!" size="40"/> <inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/> ~~- <inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" onchange="update_layout();"/>~~ + <inp2:m_RenderElement name="inp_edit_options" prefix="cf" field="ElementType" title="!la_prompt_InputType!" size="20" has_empty="1" onchange="update_layout();"/> <inp2:m_if check="cf_Field" name="ElementType" equals_to="select|multiselect|radio" db="db" inverse="inverse"> <inp2:m_RenderElement name="inp_edit_box" prefix="cf" field="ValueList" title="!la_prompt_valuelist!" size="40"/> Index: admin_templates/forms/form_field_edit.tpl =================================================================== --- admin_templates/forms/form_field_edit.tpl (revision 13268) +++ admin_templates/forms/form_field_edit.tpl (working copy) @@ -40,7 +40,7 @@ <inp2:m_RenderElement name="subsection" prefix="" fields="Prompt,ElementType,Validation,ValueList,DefaultValue,Priority,Required,DisplayInGrid" title="!la_tab_AdminUI!"/>  <inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Prompt" title="!la_prompt_FieldPrompt!" size="40"/> ~~- <inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="!la_prompt_InputType!"/>~~ + <inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="!la_prompt_InputType!" has_empty="1"/> <inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="Validation" title="!la_prompt_validation!"/> <inp2:m_RenderElement name="inp_edit_textarea" prefix="formflds" field="ValueList" title="!la_prompt_ValueList!" allow_html="0" cols="40" rows="5"/> <inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="DefaultValue" title="!la_prompt_DefaultValue!" size="40"/> Index: install/english.lang =================================================================== --- install/english.lang (revision 13268) +++ install/english.lang (working copy) @@ -508,7 +508,6 @@ <PHRASE Label="la_EditingInProgress" Module="Core" Type="1">WW91IGhhdmUgbm90IHNhdmVkIGNoYW5nZXMgdG8gdGhlIGl0ZW0geW91IGFyZSBlZGl0aW5nITxiciAvPkNsaWNrIE9LIHRvIGxvb3NlIGNoYW5nZXMgYW5kIGdvIHRvIHRoZSBzZWxlY3RlZCBzZWN0aW9uPGJyIC8+b3IgQ2FuY2VsIHRvIHN0YXkgaW4gdGhlIGN1cnJlbnQgc2VjdGlvbi4=</PHRASE> <PHRASE Label="la_editor_default_style" Module="Core" Type="1">RGVmYXVsdCB0ZXh0</PHRASE> <PHRASE Label="la_EmptyFile" Module="Core" Type="1">RmlsZSBpcyBlbXB0eQ==</PHRASE> ~~- <PHRASE Label="la_EmptyValue" Module="Core" Type="1">IA==</PHRASE>~~ <PHRASE Label="la_empty_file" Module="Core" Type="1">RmlsZSBpcyBlbXB0eQ==</PHRASE> <PHRASE Label="la_Enabled" Module="Core" Type="1">RW5hYmxlZA==</PHRASE> <PHRASE Label="la_error_cant_save_file" Module="Core" Type="1">Q2FuJ3Qgc2F2ZSBhIGZpbGU=</PHRASE> @@ -1641,6 +1640,11 @@ <PHRASE Label="lu_opt_Cookies" Module="Core" Type="1">Q29va2llcw==</PHRASE> <PHRASE Label="lu_opt_QueryString" Module="Core" Type="1">UXVlcnkgU3RyaW5nIChTSUQp</PHRASE> <PHRASE Label="lu_PermName_Admin_desc" Module="Core" Type="1">QWRtaW4gTG9naW4=</PHRASE> + <PHRASE Label="lu_PermName_Category.AddPending_desc" Module="Core" Type="2">QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=</PHRASE> + <PHRASE Label="lu_PermName_Category.Add_desc" Module="Core" Type="2">QWRkIENhdGVnb3J5</PHRASE> + <PHRASE Label="lu_PermName_Category.Delete_desc" Module="Core" Type="2">RGVsZXRlIENhdGVnb3J5</PHRASE> + <PHRASE Label="lu_PermName_Category.Modify_desc" Module="Core" Type="2">TW9kaWZ5IENhdGVnb3J5</PHRASE> + <PHRASE Label="lu_PermName_Category.View_desc" Module="Core" Type="2">VmlldyBDYXRlZ29yeQ==</PHRASE> <PHRASE Label="lu_PermName_Debug.Info_desc" Module="Core" Type="1">QXBwZW5kIHBocGluZm8gdG8gYWxsIHBhZ2VzIChEZWJ1Zyk=</PHRASE> <PHRASE Label="lu_PermName_Debug.Item_desc" Module="Core" Type="1">RGlzcGxheSBJdGVtIFF1ZXJpZXMgKERlYnVnKQ==</PHRASE> <PHRASE Label="lu_PermName_Debug.List_desc" Module="Core" Type="1">RGlzcGxheSBJdGVtIExpc3QgUXVlcmllcyAoRGVidWcp</PHRASE> @@ -1648,11 +1652,6 @@ <PHRASE Label="lu_PermName_Login_desc" Module="Core" Type="1">QWxsb3cgTG9naW4=</PHRASE> <PHRASE Label="lu_PermName_Profile.Modify_desc" Module="Core" Type="1">Q2hhbmdlIFVzZXIgUHJvZmlsZXM=</PHRASE> <PHRASE Label="lu_PermName_ShowLang_desc" Module="Core" Type="1">U2hvdyBMYW5ndWFnZSBUYWdz</PHRASE> ~~- <PHRASE Label="lu_PermName_Category.AddPending_desc" Module="Core" Type="2">QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=</PHRASE>~~ ~~- <PHRASE Label="lu_PermName_Category.Add_desc" Module="Core" Type="2">QWRkIENhdGVnb3J5</PHRASE>~~ ~~- <PHRASE Label="lu_PermName_Category.Delete_desc" Module="Core" Type="2">RGVsZXRlIENhdGVnb3J5</PHRASE>~~ ~~- <PHRASE Label="lu_PermName_Category.Modify_desc" Module="Core" Type="2">TW9kaWZ5IENhdGVnb3J5</PHRASE>~~ ~~- <PHRASE Label="lu_PermName_Category.View_desc" Module="Core" Type="2">VmlldyBDYXRlZ29yeQ==</PHRASE>~~ </PHRASES> <EVENTS> <EVENT MessageType="html" Event="CATEGORY.ADD" Type="0">U3ViamVjdDogTmV3IENhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIC0gQWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGhhcyBiZWVuIGFkZGVkLg==</EVENT> Index: units/custom_fields/custom_fields_config.php =================================================================== --- units/custom_fields/custom_fields_config.php (revision 13268) +++ units/custom_fields/custom_fields_config.php (working copy) @@ -96,7 +96,7 @@ 'MultiLingual' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), 'Heading' => Array('type' => 'string', 'required' => 1, 'default' => null), 'Prompt' => Array('type' => 'string','default' => null), - 'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null'=>1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'multiselect' => 'la_type_multiselect', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_checkbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label', 'date' => 'la_type_date', 'datetime' => 'la_type_datetime')), + 'ElementType' => Array('required'=>'1', 'type'=>'string', 'not_null'=>1, 'default'=>'', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array('text' => 'la_type_text', 'select' => 'la_type_select', 'multiselect' => 'la_type_multiselect', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_checkbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label', 'date' => 'la_type_date', 'datetime' => 'la_type_datetime')), 'ValueList' => Array('type' => 'string','default' => null), 'DefaultValue' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'DisplayOrder' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), Index: units/form_fields/form_fields_config.php =================================================================== --- units/form_fields/form_fields_config.php (revision 13268) +++ units/form_fields/form_fields_config.php (working copy) @@ -67,7 +67,7 @@ 'Prompt' => Array('type' => 'string', 'default' => null, 'required' => 1), 'ElementType' => Array( 'type' => 'string', - 'formatter' => 'kOptionsFormatter', 'options' => Array ('' => 'la_EmptyValue', 'text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label'), 'use_phrases' => 1, + 'formatter' => 'kOptionsFormatter', 'options' => Array ('text' => 'la_type_text', 'select' => 'la_type_select', 'radio' => 'la_type_radio', 'checkbox' => 'la_type_SingleCheckbox', 'password' => 'la_type_password', 'textarea' => 'la_type_textarea', 'label' => 'la_type_label'), 'use_phrases' => 1, 'required' => 1, 'not_null' => 1, 'default' => '', ), 'ValueList' => Array('type' => 'string','default' => null),

Index: admin_templates/products/option_edit.tpl =================================================================== --- admin_templates/products/option_edit.tpl (revision 13268) +++ admin_templates/products/option_edit.tpl (working copy) @@ -310,7 +310,7 @@ <inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Name" title="!la_fld_Name!" size="40"/> <inp2:m_RenderElement name="inp_edit_checkbox" prefix="po" field="Required" title="!la_fld_Required!"/>  ~~- <inp2:m_RenderElement name="inp_edit_options" prefix="po" field="OptionType" title="!la_fld_OptionType!" onchange="update_type(this.value)"/>~~ + <inp2:m_RenderElement name="inp_edit_options" prefix="po" field="OptionType" has_empty="1" empty_value="0" title="!la_fld_OptionType!" onchange="update_type(this.value)"/> <inp2:m_RenderElement name="inp_edit_box" prefix="po" field="Priority" title="!la_fld_Priority!" size="2"/> <inp2:m_RenderElement name="options_list" prefix="po" field="Values" title="!la_fld_Values!" size="2"/> <inp2:m_RenderElement name="inp_edit_filler"/> Index: units/product_options/product_options_config.php =================================================================== --- units/product_options/product_options_config.php (revision 13268) +++ units/product_options/product_options_config.php (working copy) @@ -63,7 +63,7 @@ 'ProductOptionId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'ProductId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), 'Name' => Array('type' => 'string', 'required' => 1, 'max_len' => 255, 'not_null' => 1, 'default' => '',), - 'OptionType' => Array('type' => 'int', 'required' => 1, 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(0 => '!la_EmptyValue!', 1 => '!la_type_select!', 5 => '!la_type_text!', 4 => '!la_type_textarea!', 3 => '!la_type_radio!', 6 => '!la_type_checkbox!' /*, 2 => '!la_type_password!' */), 'not_null' => 1, 'default' => 0), + 'OptionType' => Array('type' => 'int', 'required' => 1, 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1 => '!la_type_select!', 5 => '!la_type_text!', 4 => '!la_type_textarea!', 3 => '!la_type_radio!', 6 => '!la_type_checkbox!' /*, 2 => '!la_type_password!' */), 'not_null' => 1, 'default' => 0), 'Required' => Array('type' => 'int', 'not_null'=>1, 'default'=>0, 'formatter'=>'kOptionsFormatter', 'use_phrases'=>1, 'options'=>array(0=>'la_No', 1=>'la_Yes')), 'Listable' => Array('type' => 'int', 'not_null'=>1, 'default'=>0, 'formatter'=>'kOptionsFormatter', 'use_phrases'=>1, 'options'=>array(0=>'la_No', 1=>'la_Yes')), 'Priority' => Array('type' => 'int', 'not_null'=>1, 'default'=>0),

Issue History
Date Modified	Username	Field	Change
2010-05-11 02:59	alex	Note Added: 0002106
2010-05-11 02:59	alex	Status	resolved => closed
2010-04-06 02:57	alex	Note Added: 0001800
2010-04-06 02:57	alex	Status	reviewed and tested => resolved
2010-04-06 02:57	alex	Fixed in Version	=> 5.0.3-B2
2010-04-06 02:57	alex	Resolution	open => fixed
2010-04-06 02:57	alex	Assigned To	!COMMUNITY => alex
2010-04-06 02:57	alex	Changeset attached	5.0.x r13331
2010-04-06 02:56	alex	Additional Information Updated	View Revisions
2010-04-06 02:54	alex	Changeset attached	5.0.x r13330
2010-04-05 21:58	Dmitry	Note Added: 0001799
2010-04-05 21:58	Dmitry	Status	needs testing => reviewed and tested
2010-04-05 17:12	alex	Note Added: 0001797
2010-04-05 17:12	alex	Status	needs work => needs testing
2010-04-05 17:12	alex	File Added: remove_empty_value_phrase_core_v2.patch
2010-04-03 22:40	Dmitry	Note Added: 0001776
2010-04-03 22:40	Dmitry	Status	needs testing => needs work
2010-03-24 04:50	alex	Note Deleted: 0001716
2010-03-24 04:50	alex	version	5.0.2 => 5.0.3-B1
2010-03-21 13:09	alex	Note Added: 0001716
2010-03-21 13:09	alex	Assigned To	=> !COMMUNITY
2010-03-21 13:09	alex	Developer	=> alex
2010-03-21 13:09	alex	Status	active => needs testing
2010-03-21 13:08	alex	Reference	=> http://groups.google.com/group/in-portal-bugs/browse_thread/thread/9e3f26e0378b0126
2010-03-21 13:08	alex	File Added: remove_empty_value_phrase_modules.patch
2010-03-21 13:07	alex	New Issue
2010-03-21 13:07	alex	File Added: remove_empty_value_phrase_core.patch

Notes
(0001776) Dmitry (manager) 2010-04-03 22:40	Can't apply patch Core patch due to some outdated code in patch. Please review, correct and provide updated patch. Thanks.

(0001797) alex (manager) 2010-04-05 17:12	Done. Please Test.

(0001799) Dmitry (manager) 2010-04-05 21:58	Patch tested good! Please apply.

(0001800) alex (manager) 2010-04-06 02:57	Fix committed to 5.0.x branch. Commit Message: Fixes 0000634: Remove "la_EmptyValue" phrase

(0002106) alex (manager) 2010-05-11 02:59	Closing all tasks from released versions.

Related Changesets
In-Portal CMS: 5.0.x r13331 Timestamp: 2010-04-06 02:57:23 Author: alex [ Details ] [ Diff ]	Fixes 0000634: Remove "la_EmptyValue" phrase
	mod - /in-portal/branches/5.0.x/core/admin_templates/custom_fields/custom_fields_edit.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/admin_templates/forms/form_field_edit.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/custom_fields/custom_fields_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.0.x/core/units/form_fields/form_fields_config.php	[ Diff ] [ File ]

Modules :: In-Commerce: 5.0.x r13330 Timestamp: 2010-04-06 02:54:36 Author: alex [ Details ] [ Diff ]	Bug 0000634: Remove "la_EmptyValue" phrase
	mod - /w/in-commerce/branches/5.0.x/admin_templates/products/option_edit.tpl	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.0.x/units/product_options/product_options_config.php	[ Diff ] [ File ]

Relationships [ Relation Graph ] [ Dependency Graph ]