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 398b2901ebde062eec5ce82be2bb4f00f1b2c381 (commit)
from d9bcfa715964c12c872815a9935d9483ef0eb876 (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=398b2901ebde062eec5ce82be2bb4f00f1b2c381
commit 398b2901ebde062eec5ce82be2bb4f00f1b2c381
Author: Stéphane-Eymeric Bredthauer <[email protected]>
Date: Wed Jul 27 11:26:57 2016 +0200
Taskboard: show User Sories without task & unlinked tasks + fix
diff --git a/src/plugins/taskboard/common/TaskBoard.class.php
b/src/plugins/taskboard/common/TaskBoard.class.php
index 6d40146..7c0f3f0 100644
--- a/src/plugins/taskboard/common/TaskBoard.class.php
+++ b/src/plugins/taskboard/common/TaskBoard.class.php
@@ -577,6 +577,19 @@ class TaskBoard extends FFError {
)
);
+ if($this->getReleaseFieldTracker() == RELEASE_OF_USER_STORY) {
+ $tasks_trackers = $this->getUsedTrackersData();
+ foreach($tasks_trackers as $tasks_tracker_data) {
+ $tasks =
$this->TrackersAdapter->getTasks($tasks_tracker_data['group_artifact_id'],
$assigned_to, NULL, NULL);
+ foreach($tasks as $task) {
+ $task_maped =
$this->getMappedTask($task);
+ if ($task_maped['user_story']==0) {
+ $stories[0]['tasks'][] =
$task_maped;
+ }
+ }
+ }
+ }
+
$user_stories_sort_field = $this->getUserStoriesSortField();
$user_stories_sort_extra_field_id = NULL;
if ($user_stories_sort_field) {
@@ -641,16 +654,7 @@ class TaskBoard extends FFError {
}
}
- $but = array_values($stories);
-
- //leave only stories, having not empty tasks list
- $ret_stories = array();
- foreach($but as $us) {
- if (count($us['tasks']) > 0 ) {
- $ret_stories[] = $us;
- }
- }
-
+ $ret_stories = array_values($stories);
usort($ret_stories, array($this, 'sortUserStories'));
return $ret_stories;
diff --git a/src/plugins/taskboard/common/actions/init.php
b/src/plugins/taskboard/common/actions/init.php
index aaac255..55370fb 100644
--- a/src/plugins/taskboard/common/actions/init.php
+++ b/src/plugins/taskboard/common/actions/init.php
@@ -38,7 +38,11 @@ if (getStringFromRequest('post_changes')) {
session_redirect('/plugins/'.$pluginTaskboard->name.'/admin/?group_id='.$group_id,
false);
} else {
if ($taskboard_id) {
- $ret =
$taskboard->update($taskboard_name,$taskboard_description);
+ if ($taskboard_name!=$taskboard->getName() ||
$taskboard_description!=$taskboard->getDescription()) {
+ $ret =
$taskboard->update($taskboard_name,$taskboard_description);
+ } else {
+ $ret = true;
+ }
} else {
$ret =
$taskboard->create($taskboard_name,$taskboard_description);
}
@@ -52,7 +56,11 @@ if (getStringFromRequest('post_changes')) {
}
} else {
db_commit();
- $feedback = _('Taskboard successfully created');
+ if ($taskboard_id) {
+ $feedback = _('Taskboard successfully updated');
+ } else {
+ $feedback = _('Taskboard successfully created');
+ }
session_redirect('/plugins/'.$pluginTaskboard->name.'/admin/?group_id='.$group_id.'&taskboard_id='.$taskboard->getID(),
false);
}
}
diff --git
a/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
b/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
index ed2e1c8..5922c82 100644
--- a/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
+++ b/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
@@ -286,9 +286,9 @@ class TaskBoardBasicAdapter {
}
// link create task to user story (if specified)
- if ($user_story_id && $user_story_alias) {
+ if (!is_null($user_story_id) && $user_story_alias) {
if(array_key_exists($user_story_alias,
$fields_ids)) {
- $extra_fields[ $fields_ids[
$user_story_alias ] ] = $user_story_id;
+ $extra_fields[ $fields_ids[
$user_story_alias ] ] = ($user_story_id!=0 ? $user_story_id : '');
}
}
diff --git a/src/plugins/taskboard/common/views/admin/init.php
b/src/plugins/taskboard/common/views/admin/init.php
index 516df67..b9dc7b5 100644
--- a/src/plugins/taskboard/common/views/admin/init.php
+++ b/src/plugins/taskboard/common/views/admin/init.php
@@ -45,7 +45,7 @@ if ($taskboard_id) {
$taskboardFactory->header(
array(
- 'title' => _('Administration - Create New Taskboard'),
+ 'title' => _('Taskboards for
').$taskboardFactory->Group->getPublicName()._(': ')._('Administration - Create
New Taskboard'),
'pagename' => _('Administration'),
'sectionvals' => array($group->getPublicName()),
'group' => $group_id
-----------------------------------------------------------------------
Summary of changes:
src/plugins/taskboard/common/TaskBoard.class.php | 24 +++++++++++++---------
src/plugins/taskboard/common/actions/init.php | 12 +++++++++--
.../adapters/TaskBoardBasicAdapter.class.php | 4 ++--
src/plugins/taskboard/common/views/admin/init.php | 2 +-
4 files changed, 27 insertions(+), 15 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
