From 0a937291941290a5d8ef10c5eeaa0d4d14cd8efb Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 8 May 2012 16:10:35 +0000 Subject: [PATCH] * ProjectManager/InfoLog: fixed custom type icon in PM to use status label, as in InfoLog --- infolog/inc/class.infolog_bo.inc.php | 2 ++ infolog/inc/class.infolog_so.inc.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php index 1005977a89..27bb0d12dc 100644 --- a/infolog/inc/class.infolog_bo.inc.php +++ b/infolog/inc/class.infolog_bo.inc.php @@ -1379,6 +1379,8 @@ class infolog_bo { if ($status && substr($status,-1) != '%') { + list($type,$status) = explode('-', $status); + $status = $this->status[$type][$status]; $icons[$id] = 'infolog/'.$status; } } diff --git a/infolog/inc/class.infolog_so.inc.php b/infolog/inc/class.infolog_so.inc.php index 12186f0c20..128858237f 100644 --- a/infolog/inc/class.infolog_so.inc.php +++ b/infolog/inc/class.infolog_so.inc.php @@ -425,7 +425,8 @@ class infolog_so $status = 'will-call'; break; default: - $status = $info['info_status'] == 'ongoing' ? $info['info_percent'].'%' : $info['info_status']; + $status = $info['info_status'] == 'ongoing' ? $info['info_percent'].'%' : + $info['info_type'].'-'.$info['info_status']; } $stati[$info['info_id']] = $status; }