extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Change from 0% to 10% when changing not started to ongoing

Browse Source 
- When changing type column filter, clear status if it is not in the new type
This commit is contained in:
Nathan Gray 2015-11-26 16:07:36 +00:00
parent 9a97d108a5
commit 3a84c8118f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

2
infolog/js/app.js
View File

@ -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;
}