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.0 has been updated
via b60fecfe3afe1441f68734c961af30108dc3e4e7 (commit)
from 6ead7e31f4f9f440eb8328ea29ebaf01b4753360 (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=b60fecfe3afe1441f68734c961af30108dc3e4e7
commit b60fecfe3afe1441f68734c961af30108dc3e4e7
Author: Franck Villaume <[email protected]>
Date: Sun Jun 28 15:19:51 2015 +0200
plugin taskboard: fix logic on initialize error
diff --git a/src/CHANGES b/src/CHANGES
index ca459a3..d7c0184 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -4,6 +4,7 @@ FusionForge 6.0.2:
* Mailing lists: fix default list URL path (Inria)
* Mailing lists: fix installation on CentOS (Inria)
* FRS: don't reset permissions when derefencing roles in other projects [#782]
(Inria)
+* Plugin Taskboard: fix logic on initialize error (TrivialDev)
FusionForge 6.0.1:
* Accounts: accept elliptic curve ssh keys (Unit 193)
diff --git a/src/plugins/taskboard/www/index.php
b/src/plugins/taskboard/www/index.php
index 182f687..dd0d119 100644
--- a/src/plugins/taskboard/www/index.php
+++ b/src/plugins/taskboard/www/index.php
@@ -41,11 +41,6 @@ if (!$group_id) {
}
$taskboard = new TaskBoardHtml($group);
-
- if( $taskboard->isError() ) {
- exit_error($taskboard->getErrorMessage());
- }
-
$taskboard->header(
array(
'title' => _('Taskboard for ').$group->getPublicName(),
@@ -55,26 +50,30 @@ if (!$group_id) {
)
);
- if(count($taskboard->getUsedTrackersIds()) == 0) {
- echo $HTML->warning_msg(_('Choose at least one tracker for
using with taskboard.'));
+ if($taskboard->isError()) {
+ echo $HTML->error_msg($taskboard->getErrorMessage());
} else {
- $columns = $taskboard->getColumns();
-
- if(count($columns) == 0) {
- echo $HTML->warning_msg(_('Configure columns for the
board first.'));
+ if(count($taskboard->getUsedTrackersIds()) == 0) {
+ echo $HTML->warning_msg(_('Choose at least one tracker
for using with taskboard.'));
} else {
- $messages = '';
- foreach($columns as $column) {
- if(count($column->getResolutions()) == 0) {
- $messages .= sprintf( _('Resolutions
list is empty for "%s", column is not dropable'), $column->getTitle() ).'<br>';
+ $columns = $taskboard->getColumns();
+
+ if(count($columns) == 0) {
+ echo $HTML->warning_msg(_('Configure columns
for the board first.'));
+ } else {
+
+ $messages = '';
+ foreach($columns as $column) {
+ if(count($column->getResolutions()) ==
0) {
+ $messages .= sprintf(
_('Resolutions list is empty for "%s", column is not dropable'),
$column->getTitle() ).'<br>';
+ }
}
- }
- $user_stories_tracker =
$taskboard->getUserStoriesTrackerID();
- $columns_number = count($columns) +
($user_stories_tracker ? 1 : 0);
- $column_width = intval(100 / $columns_number);
+ $user_stories_tracker =
$taskboard->getUserStoriesTrackerID();
+ $columns_number = count($columns) +
($user_stories_tracker ? 1 : 0);
+ $column_width = intval(100 / $columns_number);
?>
<div id="messages" class="warning" <?php if (!$messages) { ?> style="display:
none;" <?php } ?>><?php echo $messages ?></div>
@@ -355,6 +354,7 @@ jQuery( document ).ready(function( $ ) {
});
</script>
<?php
+ }
}
}
}
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/plugins/taskboard/www/index.php | 38 ++++++++++++++++++-------------------
2 files changed, 20 insertions(+), 19 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
