extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix warning if $pm_config["duration_units"] is no array

Browse Source
This commit is contained in:
Ralf Becker 2013-11-19 21:59:42 +00:00
parent c944df738d
commit ed2e3e3bc2
3 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infolog/inc/class.infolog_hooks.inc.php
View File

@ -107,13 +107,13 @@ class infolog_hooks
{ {
$file = Array( $file = Array(
'Site configuration' => egw::link('/index.php',array( 'Site configuration' => egw::link('/index.php',array(
'menuaction' => 'infolog.infolog_ui.admin' )), 'menuaction' => 'infolog.infolog_ui.admin' ), 'admin'),
'Global Categories' => egw::link('/index.php',array( 'Global Categories' => egw::link('/index.php',array(
'menuaction' => 'admin.admin_categories.index', 'menuaction' => 'admin.admin_categories.index',
'appname' => $appname, 'appname' => $appname,
'global_cats'=> True)), 'global_cats'=> True)),
'Custom fields, typ and status' => egw::link('/index.php',array( 'Custom fields, typ and status' => egw::link('/index.php',array(
'menuaction' => 'infolog.infolog_customfields.edit')), 'menuaction' => 'infolog.infolog_customfields.edit'), 'admin'),
); );
if ($location == 'admin') if ($location == 'admin')
{ {

9
infolog/inc/class.infolog_ui.inc.php
View File

@ -110,7 +110,8 @@ class infolog_ui
if ($GLOBALS['egw_info']['apps']['projectmanager']) if ($GLOBALS['egw_info']['apps']['projectmanager'])
{ {
$pm_config = config::read('projectmanager'); $pm_config = config::read('projectmanager');
$this->duration_format = str_replace(',','',implode('',$pm_config['duration_units'])); $this->duration_format = str_replace(',','',implode('', (array)$pm_config['duration_units']));
error_log(__METHOD__."() ".__LINE__." duration_format=$this->duration_format, duration_unit=".array2string($pm_config['duration_units']));
$this->hours_per_workday = $pm_config['hours_per_workday']; $this->hours_per_workday = $pm_config['hours_per_workday'];
unset($pm_config); unset($pm_config);
} }
@ -388,12 +389,12 @@ class infolog_ui
$query['action_id'] = array_shift($query['action_id']); // display single parent as app_header $query['action_id'] = array_shift($query['action_id']); // display single parent as app_header
} }
} }
$parent_first = count($parents) == 1; $parent_first = count($parents) == 1;
$parent_index = 0; $parent_index = 0;
// et2 nextmatch listens to total, and only displays that many rows, so add parent in or we'll lose the last row // et2 nextmatch listens to total, and only displays that many rows, so add parent in or we'll lose the last row
if($parent_first || $query['action'] = 'sp' && is_array($query['action_id'])) $query['total']++; if($parent_first || $query['action'] = 'sp' && is_array($query['action_id'])) $query['total']++;
// Check to see if we need to remove description // Check to see if we need to remove description
foreach($infos as $id => $info) foreach($infos as $id => $info)
{ {
@ -829,7 +830,7 @@ class infolog_ui
// Allow saving parent ID into favorites // Allow saving parent ID into favorites
$values['nm']['favorites'] = array('action','action_id'); $values['nm']['favorites'] = array('action','action_id');
// Allow add actions even when there's no rows // Allow add actions even when there's no rows
$values['nm']['placeholder_actions'] = array('new'); $values['nm']['placeholder_actions'] = array('new');

25
infolog/templates/default/app.css
View File

@ -1,25 +0,0 @@
/* $Id$ */
.infolog_headertext { color: black; font-size: 120%; }
.infolog_lpadding5 { padding-left: 5px; }
.low,.low_done,.normal,.normal_done,.high,.high_done,.urgent,.urgent_done { font-weight: bold; }
.low,.low_done { color:#606060; }
.normal,.normal_done { color:black }
.high { color:#cc0000; }
.high_done { color:#800000; }
.urgent { color:#ff00ff; }
.urgent_done { color:#800080; }
.infolog_overdue { color:#cc0000; font-weight:bold; }
.private { font-style:italic; }
.infolog_planned { font-style:italic; }
table.infolog_fullWidth { width: 100%; }
td.infolog_infoId:before { content:"#" }
.infolog_fixedHeight { height: 12px; }
.noWrap { white-space: nowrap; }
.infolog_user_filter select { width: 100px; }
.inputFullWidth input { width: 100%; }
.infolog_image16 img { height: 16px; }
tr.infolog_rowHasParent > td:first-child {
background-image: url(../../../phpgwapi/templates/default/images/egw_action/arrow_up.png);
background-repeat: no-repeat;
background-position: 6px -2px;
}