From 3a84c8118fe23c3c470a94779a77d52fa0d0fb1a Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 26 Nov 2015 16:07:36 +0000 Subject: [PATCH] - Change from 0% to 10% when changing not started to ongoing - When changing type column filter, clear status if it is not in the new type --- infolog/inc/class.infolog_ui.inc.php | 5 +++++ infolog/js/app.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index 0eb27dbd5f..2d34d8320b 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -408,6 +408,7 @@ class infolog_ui !in_array($query['col_filter']['info_status'], array_keys($this->bo->status[$query['col_filter']['info_type']]))) { $query['col_filter']['info_status'] = ''; + $clear_status_filter = true; } } // Template change forces the UI to do a full update first, no point in getting rows right now @@ -521,6 +522,10 @@ class infolog_ui if ($query['cat_id']) $rows['no_cat_id'] = true; if ($query['no_actions']) $rows['no_actions'] = true; $rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']); + if($clear_status_filter) + { + $rows['info_status'] = ''; + } // switch cf column off, if we have no cf's if (!$query['custom_fields']) $rows['no_customfields'] = true; diff --git a/infolog/js/app.js b/infolog/js/app.js index b2ba945962..4680200d9b 100644 --- a/infolog/js/app.js +++ b/infolog/js/app.js @@ -401,7 +401,7 @@ app.classes.infolog = AppJS.extend( { percent.value = 0; } - else if (!completed && percent.value == 100) + else if (!completed && (percent.value == 0 || percent.value == 100)) { percent.value = 10; }