This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 5e2099a408221120e4132e09fc660b66efed5acd (commit)
from b30af65decc7e5cf5c5f0dd29a562e18a039b8c7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5e2099a408221120e4132e09fc660b66efed5acd
commit 5e2099a408221120e4132e09fc660b66efed5acd
Author: Stéphane-Eymeric Bredthauer <[email protected]>
Date: Thu Aug 25 17:00:28 2016 +0200
Taskboard: fix filter tasks on taskboard display
diff --git a/src/plugins/taskboard/common/views/taskboard.php
b/src/plugins/taskboard/common/views/taskboard.php
index 962c787..a1ff69f 100644
--- a/src/plugins/taskboard/common/views/taskboard.php
+++ b/src/plugins/taskboard/common/views/taskboard.php
@@ -182,32 +182,34 @@ if ($release_box) {
</td>
<?php } ?>
</tr>
- <tr valign="middle">
- <td>
- <?php
- echo
html_build_checkbox('filter-tasks-chk', false, false);
- echo html_e('label',
array('for'=>'filter-tasks-chk'), _('Filter tasks')._(': '));
- ?>
- </td>
- <td colspan=2>
- <?php
- echo html_e('label',
array('for'=>'task-filter'), _('Filter')._(': '));
- echo html_e('input',
array('type'=>'text', 'id'=>'task-filter', 'value'=>'', 'title'=>_('Use regular
expression')));
- echo
html_build_checkbox('filter-only-on-name-chk', false, true);
- echo html_e('label',
array('for'=>'filter-only-on-name-chk'), _('Filter only on task name'));
- ?>
- </td>
- </tr>
- <tr valign="middle">
- <td>
- <?php
- echo
html_build_checkbox('hide-unlinked-task-chk', false, false);
- echo html_e('label',
array('for'=>'hide-unlinked-task-chk'), _('Hide unlinked tasks'));
- ?>
- </td>
- </tr>
</table>
</form>
+ <table cellspacing="0" width="100%">
+ <tr valign="middle">
+ <td width="10%">
+ <?php
+ echo
html_build_checkbox('filter-tasks-chk', false, false);
+ echo html_e('label',
array('for'=>'filter-tasks-chk'), _('Filter tasks')._(': '));
+ ?>
+ </td>
+ <td>
+ <?php
+ echo html_e('label',
array('for'=>'task-filter'), _('Filter')._(': '));
+ echo html_e('input',
array('type'=>'text', 'id'=>'task-filter', 'value'=>'', 'title'=>_('Use regular
expression')));
+ echo
html_build_checkbox('filter-only-on-name-chk', false, true);
+ echo html_e('label',
array('for'=>'filter-only-on-name-chk'), _('Filter only on task name'));
+ ?>
+ </td>
+ </tr>
+ <tr valign="middle">
+ <td>
+ <?php
+ echo
html_build_checkbox('hide-unlinked-task-chk', false, false);
+ echo html_e('label',
array('for'=>'hide-unlinked-task-chk'), _('Hide unlinked tasks'));
+ ?>
+ </td>
+ </tr>
+ </table>
</div>
<div id="agile-board-progress">
diff --git a/src/plugins/taskboard/www/js/agile-board.js
b/src/plugins/taskboard/www/js/agile-board.js
index 98b9e13..0a38682 100644
--- a/src/plugins/taskboard/www/js/agile-board.js
+++ b/src/plugins/taskboard/www/js/agile-board.js
@@ -96,6 +96,13 @@ function loadTaskboard( group_id ) {
'<tr><td colspan="' + aPhases.length +
'" style="text-align: center;">' + gMessages['notasks'] + '</td></tr>'
);
}
+
+ if ($('#filter-tasks-chk').is(':checked')) {
+ applyTaskFilter();
+ }
+ if ($('#hide-unlinked-task-chk').is(':checked')) {
+ hideUnlinkedTasks();
+ }
});
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/taskboard/common/views/taskboard.php | 50 ++++++++++++------------
src/plugins/taskboard/www/js/agile-board.js | 7 ++++
2 files changed, 33 insertions(+), 24 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
