extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-27 00:09:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

select priority should map 0 to None, not empty

Browse Source
This commit is contained in:
Klaus Leithoff 2013-01-31 14:13:45 +00:00
parent d5dfb4af1f
commit 435f726bf9
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1648,7 +1648,7 @@ class calendar_boupdate extends calendar_bo
); );
$pri = Array( $pri = Array(
0 => '', 0 => lang('None'),
1 => lang('Low'), 1 => lang('Low'),
2 => lang('Normal'), 2 => lang('Normal'),
3 => lang('High') 3 => lang('High')

4
calendar/inc/class.calendar_export_csv.inc.php
View File

@ -356,7 +356,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
protected function get_selects() protected function get_selects()
{ {
$this->selects['priority'] = Array( $this->selects['priority'] = Array(
0 => '', 0 => lang('None'),
1 => lang('Low'), 1 => lang('Low'),
2 => lang('Normal'), 2 => lang('Normal'),
3 => lang('High') 3 => lang('High')
@ -382,7 +382,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
*/ */
public function get_filter_fields(Array &$filters) public function get_filter_fields(Array &$filters)
{ {
// Calendar SO doesn't support filtering by column, so we have to remove pretty much everything // Calendar SO doesn't support filtering by column, so we have to remove pretty much everything
unset($filters['recur_date']); unset($filters['recur_date']);

2
calendar/inc/class.calendar_import_csv.inc.php
View File

@ -159,7 +159,7 @@ class calendar_import_csv implements importexport_iface_import_plugin {
$lookups = array( $lookups = array(
'priority' => Array( 'priority' => Array(
0 => '', 0 => lang('None'),
1 => lang('Low'), 1 => lang('Low'),
2 => lang('Normal'), 2 => lang('Normal'),
3 => lang('High') 3 => lang('High')

2
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -173,7 +173,7 @@ class calendar_uiviews extends calendar_ui
'daywise' => True, 'daywise' => True,
); );
$this->holidays = $this->bo->read_holidays($this->year); $this->holidays = $this->bo->read_holidays($this->year);
array_push($this->holidays, $this->bo->read_holidays($this->year+1));
$this->check_owners_access(); $this->check_owners_access();
if($GLOBALS['egw_info']['user']['preferences']['common']['enable_dragdrop']) if($GLOBALS['egw_info']['user']['preferences']['common']['enable_dragdrop'])

2
etemplate/inc/class.select_widget.inc.php
View File

@ -124,7 +124,7 @@ class select_widget
break; break;
case 'select-priority': case 'select-priority':
$cell['sel_options'] = array('','low','normal','high'); $cell['sel_options'] = array('none','low','normal','high');
break; break;
case 'select-bool': // equal to checkbox, can be used with nextmatch-customfilter to filter a boolean column case 'select-bool': // equal to checkbox, can be used with nextmatch-customfilter to filter a boolean column