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, 6.1 has been updated
       via  4674caba21aab432918ebf0a134d56bb8876ef10 (commit)
       via  7e4bec972d053bc4962822bb494b531a266d30cd (commit)
      from  e8955686b6d2e397aa3ce16ca7725be8fed18e64 (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=4674caba21aab432918ebf0a134d56bb8876ef10

commit 4674caba21aab432918ebf0a134d56bb8876ef10
Author: Franck Villaume <[email protected]>
Date:   Tue Jan 2 14:56:41 2018 +0000

    taskbord: fix task filtering

diff --git a/src/plugins/taskboard/www/js/agile-board.js 
b/src/plugins/taskboard/www/js/agile-board.js
index d20a511..c3dd1a3 100644
--- a/src/plugins/taskboard/www/js/agile-board.js
+++ b/src/plugins/taskboard/www/js/agile-board.js
@@ -469,7 +469,7 @@ function applyTaskFilter() {
                                        $(container).addClass('filtred');
                                }
                        } else {
-                               $TaskDescription = 
$(container).find('a.agile-toolbar-get-description').text();
+                               $TaskDescription = 
$(container).find('div.agile-sticker-description').text();
                                if (sTaskName.match(sFilter) || 
$TaskDescription.match(sFilter)) {
                                        $(container).removeClass('filtred');
                                } else {

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7e4bec972d053bc4962822bb494b531a266d30cd

commit 7e4bec972d053bc4962822bb494b531a266d30cd
Author: Franck Villaume <[email protected]>
Date:   Tue Jan 2 14:56:20 2018 +0000

    taskboard: fix html syntax

diff --git a/src/plugins/taskboard/common/views/taskboard.php 
b/src/plugins/taskboard/common/views/taskboard.php
index 730f97e..7d27b40 100644
--- a/src/plugins/taskboard/common/views/taskboard.php
+++ b/src/plugins/taskboard/common/views/taskboard.php
@@ -154,8 +154,8 @@ if ($release_box) {
                                <td colspan="<?php echo $colspan ?>">
                                </td>
                        </tr>
-                       <tr>
                <?php if ($release_box) { ?>
+                       <tr>
                                <td>
                                        <?php echo _('Release')._(': '); ?>
                                </td>
@@ -177,8 +177,8 @@ if ($release_box) {
                                                <button 
id="taskboard-burndown-btn"><?php echo _('Burndown chart'); ?></button>
                                        </div>
                                </td>
-               <?php } ?>
                        </tr>
+               <?php } ?>
                </table>
        </form>
        <table class="full">
@@ -308,7 +308,7 @@ aPhases = []
 
 jQuery( document ).ready(function( $ ) {
 
-       $("<style type='text/css'>.agile-toolbar-minimize, 
.agile-minimize-column {background-image: url('" + gThemeRoot + 
"ic/up-down-16.png');} .agile-toolbar-add-task {background-image: url('" + 
gThemeRoot + "ic/add-16.png');}</style>").appendTo('head');
+       $("<style type='text/css'>.agile-toolbar-minimize, 
.agile-minimize-column {background-image: url('" + gThemeRoot + 
"ic/up-down-16.png');} .agile-toolbar-add-task {background-image: url('" + 
gThemeRoot + "ic/add-16.png');}<\/style>").appendTo('head');
 
        loadTaskboard( <?php echo $group_id ?> );
 

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/taskboard/common/views/taskboard.php | 6 +++---
 src/plugins/taskboard/www/js/agile-board.js      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to