Skip to content

Commit 7fbc646

Browse files
committed
set default value for filter: hideNoActivitySince
1 parent 16a1731 commit 7fbc646

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

timetracking/time_tracking.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected function display() {
7979

8080
$defaultDate = Tools::getSecurePOSTStringValue('date',date("Y-m-d", time()));
8181
$defaultBugid = Tools::getSecurePOSTIntValue('bugid',0);
82-
82+
8383
$sessionProjectId = isset($_SESSION['projectid']) ? $_SESSION['projectid'] : 0;
8484
$defaultProjectid = Tools::getSecurePOSTIntValue('projectid',$sessionProjectId);
8585

@@ -151,6 +151,14 @@ protected function display() {
151151
$this->smartyHelper->assign('isHideForbidenStatus', $isHideForbidenStatus);
152152

153153
$hideNoActivitySince = $managed_user->getTimetrackingFilter('hideNoActivitySince');
154+
if (0 == $hideNoActivitySince) {
155+
// uncheck, but set value to default (instead of zero)
156+
$this->smartyHelper->assign('isHideNoActivitySince', false);
157+
$defaultFilters = Tools::doubleExplode(':', ',', Config::default_timetrackingFilters);
158+
$hideNoActivitySince = $defaultFilters['hideNoActivitySince'];
159+
} else {
160+
$this->smartyHelper->assign('isHideNoActivitySince', true);
161+
}
154162
$this->smartyHelper->assign('hideNoActivitySince', $hideNoActivitySince);
155163

156164
$availableIssues = TimeTrackingTools::getIssues($this->teamid, $defaultProjectid, $isOnlyAssignedTo, $managed_user->getId(), $projList, $isHideResolved, $isHideForbidenStatus, $defaultBugid, $hideNoActivitySince);

tpl/time_tracking.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h2>{$managedUser_realname}</h2>
4848
</select>
4949
{/if}
5050
<a title="{t}Set filters{/t}" id="filters" style="text-decoration: none" href="{$page}">
51-
{if $isOnlyAssignedTo || $isHideResolved || (0 != $hideNoActivitySince)}
51+
{if $isOnlyAssignedTo || $isHideResolved || ($isHideNoActivitySince)}
5252
<img border="0" width="16" height="12" align="absmiddle" src="images/im-filter-active.png" alt="{t}Set filters{/t}" />
5353
{else}
5454
<img border="0" width="16" height="12" align="absmiddle" src="images/im-filter.png" alt="{t}Set filters{/t}" />
@@ -141,7 +141,7 @@ <h2>{$managedUser_realname}</h2>
141141

142142
<table class="invisible">
143143
<tr>
144-
<td><input type="checkbox" id="cb_hideNoActivitySince" name="cb_hideNoActivitySince" {if (0 != $hideNoActivitySince)} checked="checked" {/if}/></td>
144+
<td><input type="checkbox" id="cb_hideNoActivitySince" name="cb_hideNoActivitySince" {if ($isHideNoActivitySince)} checked="checked" {/if}/></td>
145145
<td>
146146
<label>{t}Hide tasks with no activity since{/t} </label>
147147
<input id="hideNoActivitySince" name="hideNoActivitySince" value="{$hideNoActivitySince}" style="width:20px;"/>

0 commit comments

Comments
 (0)