composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 02:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

search widget : widget date/datetime => i18n

Browse Source 
SVN:b1162[5548]
This commit is contained in:
Bruno Da Silva
2018-03-27 13:57:33 +00:00
parent d553fad58d
commit 736838474a
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/search/search_form_criteria_date_abstract.js
View File

@@ -178,7 +178,7 @@ $(function()
var odatetimepickerOptions = $.extend({}, odatetimepickerOptionsDefault, {
var odatetimepickerOptions = $.extend({}, odatetimepickerOptionsDefault, me.options.datepicker, {
onSelect: function() {
fHandleSynchCallback(this, false);
$(this).focus();

11
js/search/search_form_handler.js
View File

@@ -16,6 +16,12 @@ $(function()
'hide_initial_criterion': false, // TODO: What is that?
'endpoint': null,
'init_opened': false,
"datepicker":
{
"dayNamesMin": ["Su","Mo","Tu","We","Th","Fr","Sa"],
"monthNamesShort": ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],
"firstDay": 0
},
'search': {
'base_oql': '',
'criterion': [
@@ -634,6 +640,11 @@ $(function()
};
}
if ('date' == sType || 'date_time' == sType)
{
oData.datepicker = this.options.datepicker;
}
// Create DOM element
var oCriteriaElem = $('<div></div>')
.addClass('sf_criteria')

15
sources/application/search/searchform.class.inc.php
View File

@@ -24,6 +24,7 @@ namespace Combodo\iTop\Application\Search;
use ApplicationContext;
use AttributeDate;
use AttributeDateTime;
use AttributeDefinition;
use CMDBObjectSet;
@@ -164,13 +165,25 @@ class SearchForm
{
$bOpen = $aExtraParams['open'];
}
$aDaysMin = array(Dict::S('DayOfWeek-Sunday-Min'), Dict::S('DayOfWeek-Monday-Min'), Dict::S('DayOfWeek-Tuesday-Min'), Dict::S('DayOfWeek-Wednesday-Min'),
Dict::S('DayOfWeek-Thursday-Min'), Dict::S('DayOfWeek-Friday-Min'), Dict::S('DayOfWeek-Saturday-Min'));
$aMonthsShort = array(Dict::S('Month-01-Short'), Dict::S('Month-02-Short'), Dict::S('Month-03-Short'), Dict::S('Month-04-Short'), Dict::S('Month-05-Short'), Dict::S('Month-06-Short'),
Dict::S('Month-07-Short'), Dict::S('Month-08-Short'), Dict::S('Month-09-Short'), Dict::S('Month-10-Short'), Dict::S('Month-11-Short'), Dict::S('Month-12-Short'));
$aSearchParams = array(
'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
'result_list_outer_selector' => "#{$aExtraParams['table_id']}",
'data_config_list_selector' => "#{$sDataConfigListSelector}",
'endpoint' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.searchform.php',
'init_opened' => $bOpen,
'date_format' => AttributeDateTime::GetFormat()->ToMomentJS(),
'datepicker' => array(
'dayNamesMin' => $aDaysMin,
'monthNamesShort' => $aMonthsShort,
'firstDay' => (int) Dict::S('Calendar-FirstDayOfWeek'),
// 'date_format' => AttributeDate::GetFormat()->ToDatePicker(),
// 'date_time_format' => AttributeDateTime::GetFormat()->ToMomentJS(),
),
'list_params' => $aListParams,
'search' => array(
'has_hidden_criteria' => (array_key_exists('hidden_criteria', $aListParams) && !empty($aListParams['hidden_criteria'])),