extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Infolog: Avoid message about invalid '0%' removed by passing correct value

Browse Source
This commit is contained in:
nathan 2023-05-09 14:30:38 -06:00
parent 820bd35689
commit 52c7429b7f
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,8 +177,8 @@ class infolog_ui
} }
if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id); if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id);
$this->bo->link_id2from($info,$action,$action_id); // unset from for $action:$action_id $this->bo->link_id2from($info,$action,$action_id); // unset from for $action:$action_id
$info['info_percent'] = (int) $info['info_percent'].'%'; $info['info_percent'] = (int)$info['info_percent'];
$editrights = $this->bo->check_access($info,Acl::EDIT); $editrights = $this->bo->check_access($info, Acl::EDIT);
$isresposible = $this->bo->is_responsible($info); $isresposible = $this->bo->is_responsible($info);
if ((!($editrights || // edit rights or more then standard responsible rights if ((!($editrights || // edit rights or more then standard responsible rights
$isresposible && array_diff($this->bo->responsible_edit,array('info_status','info_percent','info_datecompleted'))))) $isresposible && array_diff($this->bo->responsible_edit,array('info_status','info_percent','info_datecompleted')))))
@ -2126,8 +2126,14 @@ class infolog_ui
{ {
$content['info_type'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['preferred_type']; $content['info_type'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['preferred_type'];
} }
if (empty($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']]; if(empty($content['info_status']))
if (empty($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%'; {
$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
}
if(empty($content['info_percent']))
{
$content['info_percent'] = $content['info_status'] == 'done' ? '100' : '0';
}
break; break;
} }
if (!isset($this->bo->enums['type'][$content['info_type']])) if (!isset($this->bo->enums['type'][$content['info_type']]))
@ -2397,8 +2403,11 @@ class infolog_ui
$content['info_type'] = $types[0]; $content['info_type'] = $types[0];
} }
// get a consistent status, percent and date-completed // get a consistent status, percent and date-completed
if (!isset($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']]; if(!isset($content['info_status']))
if (!isset($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%'; {
$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
}
if(!isset($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100' : '0';
$content['info_datecompleted'] =$content['info_status'] == 'done' ? $this->bo->user_time_now : 0; $content['info_datecompleted'] =$content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
if (!isset($content['info_cat'])) $content['info_cat'] = $this->prefs['cat_add_default']; if (!isset($content['info_cat'])) $content['info_cat'] = $this->prefs['cat_add_default'];