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 e76bc193f2c1dad976d82a2eaad771f9531e2e10 (commit)
from 16ca676898e7fdfff5094fbe2271c9c26d05b305 (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=e76bc193f2c1dad976d82a2eaad771f9531e2e10
commit e76bc193f2c1dad976d82a2eaad771f9531e2e10
Author: Franck Villaume <[email protected]>
Date: Tue Jul 28 20:12:45 2015 +0200
fix [#781]: artifacts disappear when dropped into a closed status mapped
column
diff --git
a/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
b/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
index f6283c9..0bd5ba8 100644
--- a/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
+++ b/src/plugins/taskboard/common/adapters/TaskBoardBasicAdapter.class.php
@@ -174,12 +174,14 @@ class TaskBoardBasicAdapter {
$elements =
$at->getExtraFieldElements($extra_field_id);
foreach($elements as $e) {
+ if ($field_alias ==
'resolution' && $e['status_id'] == 2) {
+ continue;
+ }
$this->_elements[$tracker_id][$extra_field_id][$e['element_name']] =
$e['element_id'];
}
}
$ret =
$this->_elements[$tracker_id][$extra_field_id];
-
}
}
diff --git a/src/plugins/taskboard/common/views/admin/columns.php
b/src/plugins/taskboard/common/views/admin/columns.php
index bb8f7fa..e0bb4c9 100644
--- a/src/plugins/taskboard/common/views/admin/columns.php
+++ b/src/plugins/taskboard/common/views/admin/columns.php
@@ -61,33 +61,39 @@ if (count($taskboard->getUsedTrackersIds()) == 0) {
}
echo $HTML->listTableBottom();
- echo $HTML->openForm(array('action' =>
'/plugins/'.$pluginTaskboard->name.'/admin/?group_id='.$group_id.'&action=columns',
'method' => 'post'));
- echo html_e('input', array('type' => 'hidden', 'name' =>
'post_changes', 'value' => 'y'));
+ $unused_resolutions = array_values($taskboard->getUnusedResolutions());
echo html_e('h2', array(), _('Add new column').(':'));
- echo $HTML->listTableTop();
- $cells = array();
- $cells[][] = html_e('strong', array(),
_('Title').utils_requiredField()._(':'));
- $cells[][] = html_e('input', array('type' => 'text', 'name' =>
'column_title', 'required' => 'required'));
- echo $HTML->multiTableRow(array(), $cells);
- $cells = array();
- $cells[][] = html_e('strong', array(), _('Title backgound
color')._(':'));
- $cells[][] = $taskboard->colorBgChooser('title_bg_color');
- echo $HTML->multiTableRow(array(), $cells);
- $cells = array();
- $cells[][] = html_e('strong', array(), _('Column Background
color')._(':'));
- $cells[][] = $taskboard->colorBgChooser('column_bg_color', 'white');
- echo $HTML->multiTableRow(array(), $cells);
- $cells = array();
- $cells[][] = html_e('strong', array(), _('Maximum tasks
number')._(':'));
- $cells[][] = html_e('input', array('type' => 'text', 'name' =>
'column_max_tasks'));
- echo $HTML->multiTableRow(array(), $cells);
- $cells = array();
- $cells[][] = html_e('strong', array(), _('Drop resolution by
default').utils_requiredField()._(':'));
- $unused_resolutions = array_values( $taskboard->getUnusedResolutions()
);
- $cells[][] = html_build_select_box_from_arrays( $unused_resolutions,
$unused_resolutions, 'resolution_by_default', NULL, false);
- echo $HTML->multiTableRow(array(), $cells);
- echo $HTML->listTableBottom();
- echo html_e('p', array(), html_e('input', array('type' => 'submit',
'name' => 'post_changes', 'value' => _('Submit'))));
- echo $HTML->closeForm();
- echo $HTML->addRequiredFieldsInfoBox();
+ if (count($unused_resolutions)) {
+ echo $HTML->openForm(array('action' =>
'/plugins/'.$pluginTaskboard->name.'/admin/?group_id='.$group_id.'&action=columns',
'method' => 'post'));
+ echo html_e('input', array('type' => 'hidden', 'name' =>
'post_changes', 'value' => 'y'));
+
+ echo $HTML->listTableTop();
+ $cells = array();
+ $cells[][] = html_e('strong', array(),
_('Title').utils_requiredField()._(':'));
+ $cells[][] = html_e('input', array('type' => 'text', 'name' =>
'column_title', 'required' => 'required'));
+ echo $HTML->multiTableRow(array(), $cells);
+ $cells = array();
+ $cells[][] = html_e('strong', array(), _('Title backgound
color')._(':'));
+ $cells[][] = $taskboard->colorBgChooser('title_bg_color');
+ echo $HTML->multiTableRow(array(), $cells);
+ $cells = array();
+ $cells[][] = html_e('strong', array(), _('Column Background
color')._(':'));
+ $cells[][] = $taskboard->colorBgChooser('column_bg_color',
'white');
+ echo $HTML->multiTableRow(array(), $cells);
+ $cells = array();
+ $cells[][] = html_e('strong', array(), _('Maximum tasks
number')._(':'));
+ $cells[][] = html_e('input', array('type' => 'text', 'name' =>
'column_max_tasks'));
+ echo $HTML->multiTableRow(array(), $cells);
+ $cells = array();
+ $cells[][] = html_e('strong', array(), _('Drop resolution by
default').utils_requiredField()._(':'));
+
+ $cells[][] = html_build_select_box_from_arrays(
$unused_resolutions, $unused_resolutions, 'resolution_by_default', NULL, false);
+ echo $HTML->multiTableRow(array(), $cells);
+ echo $HTML->listTableBottom();
+ echo html_e('p', array(), html_e('input', array('type' =>
'submit', 'name' => 'post_changes', 'value' => _('Submit'))));
+ echo $HTML->closeForm();
+ echo $HTML->addRequiredFieldsInfoBox();
+ } else {
+ echo $HTML->information(_('All resolutions are mapped to
columns. To add a new column, you need at least one unmapped resolution.'));
+ }
}
-----------------------------------------------------------------------
Summary of changes:
.../adapters/TaskBoardBasicAdapter.class.php | 4 +-
.../taskboard/common/views/admin/columns.php | 62 ++++++++++++----------
2 files changed, 37 insertions(+), 29 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
