AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not hardcode reset filter value

This commit is contained in:
Frederic Guillot 2015-10-11 17:24:56 -04:00
parent dc0749ecce
commit c77c9443e9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Template/app/filters_helper.php
View File

@ -1,7 +1,7 @@
<div class="dropdown filters">
<i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Filters') ?></a>
<ul>
<li><a href="#" class="filter-helper" data-filter="<?= isset($reset) ? $reset : '' ?>" title="<?= t('Keyboard shortcut: "%s"', 'r') ?>"><?= t('Reset filters') ?></a></li>
<li><a href="#" class="filter-helper filter-reset" data-filter="<?= isset($reset) ? $reset : '' ?>" title="<?= t('Keyboard shortcut: "%s"', 'r') ?>"><?= t('Reset filters') ?></a></li>
<li><a href="#" class="filter-helper" data-filter="status:open assignee:me"><?= t('My tasks') ?></a></li>
<li><a href="#" class="filter-helper" data-filter="status:open assignee:me due:tomorrow"><?= t('My tasks due tomorrow') ?></a></li>
<li><a href="#" class="filter-helper" data-filter="status:open due:today"><?= t('Tasks due today') ?></a></li>

2
assets/js/app.js
View File

File diff suppressed because one or more lines are too long

7
assets/js/src/Search.js
View File

@ -89,14 +89,15 @@ Search.prototype.keyboardShortcuts = function() {
// Reset to the search field
Mousetrap.bind("r", function(e) {
e.preventDefault();
$("#form-search").val("status:open");
var reset = $(".filter-reset").data("filter");
$("#form-search").val(reset);
if ($('#board').length) {
self.app.board.reloadFilters("status:open");
self.app.board.reloadFilters(reset);
}
else {
$("form.search").submit();
}
});
};