holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix no longer working 'None' category option

Browse Source
This commit is contained in:
Nathan Gray 2014-08-11 22:50:38 +00:00
parent f7589316e0
commit 0fa3ad831b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -181,10 +181,10 @@ class etemplate_widget_nextmatch extends etemplate_widget
if(!$value['no_cat'] && !$value['cat_is_select']) if(!$value['no_cat'] && !$value['cat_is_select'])
{ {
$cat_app = $value['cat_app'] ? $value['cat_app'] : $GLOBALS['egw_info']['flags']['current_app']; $cat_app = $value['cat_app'] ? $value['cat_app'] : $GLOBALS['egw_info']['flags']['current_app'];
$value['options-cat_id'] = array(); $value['options-cat_id'] = self::$request->sel_options['cat_id'] ? self::$request->sel_options['cat_id'] : array();
// Add 'All', if not already there // Add 'All', if not already there
if(!$value['options-cat_id'][''] && !($value['options-cat_id'][0] && $value['options-cat_id'][0]['value'] == '')) if(!$value['options-cat_id'][''] && !$value['options-cat_id'][0])
{ {
$value['options-cat_id'][''] = lang('all'); $value['options-cat_id'][''] = lang('all');
} }

2
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -889,7 +889,7 @@ class timesheet_ui extends timesheet_bo
$sel_options = array( $sel_options = array(
'ts_owner' => $read_grants, 'ts_owner' => $read_grants,
'pm_id' => array(lang('No project')), 'pm_id' => array(lang('No project')),
'cat_id' => array(lang('None')), 'cat_id' => array(array('value' => '', 'label' => lang('all')), array('value' => 0, 'label'=>lang('None'))),
'ts_status' => $this->status_labels+array(lang('No status')), 'ts_status' => $this->status_labels+array(lang('No status')),
); );
if($this->config_data['history']) if($this->config_data['history'])