composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

search widget : date widget UI tests

Browse Source 
SVN:b1162[5490]
This commit is contained in:
Bruno Da Silva
2018-03-21 16:38:30 +00:00
parent 6afb3a06ac
commit 60d6bb79b3
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/nicewebpage.class.inc.php
View File

@@ -58,6 +58,7 @@ class NiceWebPage extends WebPage
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js');
$this->add_dict_entries('UI:Combo');

20
dictionaries/en.dictionary.itop.ui.php
View File

@@ -1401,18 +1401,32 @@ When associated with a trigger, each action is given an "order" number, specifyi
'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => '>=',
'UI:Search:Criteria:Operator:Numeric:LessThan' => '<',
'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => '<=',
'UI:Search:Criteria:Operator:Numeric:DifferentThan' => 'Not',
'UI:Search:Criteria:Operator:Numeric:Different' => '≠',
'UI:Search:Criteria:Operator:Numeric:Between' => 'Between:',
// - DateTime widget
'UI:Search:Criteria:Operator:DateTime:Between' => 'Between:',
// - Criteria titles
// - Default widget
'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty',
'UI:Search:Criteria:Title:Default:Equals' => '%1$s equals %2$s',
'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s',
'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s',
'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
'UI:Search:Criteria:Title:Default:Between' => '%1$s between (%2$s)',
'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s between (%2$s)',
// - String widget
'UI:Search:Criteria:Title:String:Contains' => '%1$s contains %2$s',
'UI:Search:Criteria:Title:String:StartsWith' => '%1$s starts with %2$s',
'UI:Search:Criteria:Title:String:EndsWith' => '%1$s ends with %2$s',
// - Numeric widget
// 'UI:Search:Criteria:Title:Numeric:Equals' => '%1$s equals %2$s',
// - DateTime widget
'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
// - External key widget
'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined',
'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined',
@@ -1427,4 +1441,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
// -
'UI:Search:Value:Filter:Placeholder' => 'Filter...',
'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
// - Widget other translations
'UI:Search:Criteria:DateTime:From' => 'From',
'UI:Search:Criteria:DateTime:Until' => 'Until',
));

2
js/search/search_form_criteria_numeric.js
View File

@@ -42,7 +42,7 @@ $(function()
// 'dropdown_group':1,
},
'!=': {
'label': Dict.S('UI:Search:Criteria:Operator:Numeric:DifferentThan'),
'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Different'),
'code': 'different',
'rank': 500,
// 'dropdown_group':1,