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 053a1683127bedbebae5d9151718dc52c732e6cb (commit)
from ac16a8cee952057452ce87d685045d590530bdc7 (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=053a1683127bedbebae5d9151718dc52c732e6cb
commit 053a1683127bedbebae5d9151718dc52c732e6cb
Author: Franck Villaume <[email protected]>
Date: Sun Jun 28 15:58:33 2015 +0200
plugin taskboard: fix column background none -> white
diff --git a/src/CHANGES b/src/CHANGES
index be2ae21..a91c4cf 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -6,6 +6,7 @@ FusionForge 6.0.2:
* FRS: don't reset permissions when derefencing roles in other projects [#782]
(Inria)
* Tracker: fix column title in add/update custom field elements (TrivialDev)
* Plugin Taskboard: fix logic on initialize error (TrivialDev)
+* Plugin Taskboard: fix background column color setting (TrivialDev)
FusionForge 6.0.1:
* Accounts: accept elliptic curve ssh keys (Unit 193)
diff --git a/src/plugins/taskboard/common/include/TaskBoardHtml.class.php
b/src/plugins/taskboard/common/include/TaskBoardHtml.class.php
index 704548e..decc7cc 100644
--- a/src/plugins/taskboard/common/include/TaskBoardHtml.class.php
+++ b/src/plugins/taskboard/common/include/TaskBoardHtml.class.php
@@ -80,13 +80,13 @@ class TaskBoardHtml extends TaskBoard {
if( method_exists($this->TrackersAdapter,
'trackersColorChooser' ) ) {
return $this->TrackersAdapter->trackersColorChooser(
$name, $color );
} else {
- $l_aColors = array( 'none', 'Khaki', 'Gold',
'LawnGreen', 'PaleGreen', 'Salmon', 'PeachPuff', 'LightBlue', 'Silver' );
+ $l_aColors = array( 'White', 'Khaki', 'Gold',
'LawnGreen', 'PaleGreen', 'Salmon', 'PeachPuff', 'LightBlue', 'Silver' );
return $this->_colorChooser( $name, $l_aColors,
'Silver', $color );
}
}
function colorBgChooser($name, $color='Silver') {
- $l_aColors = array('none', 'Khaki', 'Gold', 'LawnGreen',
'PaleGreen', 'Salmon', 'PeachPuff', 'LightBlue', 'Silver');
+ $l_aColors = array('White', 'Khaki', 'Gold', 'LawnGreen',
'PaleGreen', 'Salmon', 'PeachPuff', 'LightBlue', 'Silver');
return $this->_colorChooser($name, $l_aColors, 'Silver',
$color);
}
diff --git a/src/plugins/taskboard/common/views/admin/columns.php
b/src/plugins/taskboard/common/views/admin/columns.php
index c3035c0..bb8f7fa 100644
--- a/src/plugins/taskboard/common/views/admin/columns.php
+++ b/src/plugins/taskboard/common/views/admin/columns.php
@@ -75,7 +75,7 @@ if (count($taskboard->getUsedTrackersIds()) == 0) {
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = html_e('strong', array(), _('Column Background
color')._(':'));
- $cells[][] = $taskboard->colorBgChooser('column_bg_color', 'none');
+ $cells[][] = $taskboard->colorBgChooser('column_bg_color', 'white');
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = html_e('strong', array(), _('Maximum tasks
number')._(':'));
@@ -83,7 +83,7 @@ if (count($taskboard->getUsedTrackersIds()) == 0) {
echo $HTML->multiTableRow(array(), $cells);
$cells = array();
$cells[][] = html_e('strong', array(), _('Drop resolution by
default').utils_requiredField()._(':'));
- $unused_resolutions = array_values( $taskboard->getUnusedResolutions()
);
+ $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();
diff --git
a/src/plugins/taskboard/db/20150628-plugin-taskboard-fix-columnbackgroundcolor.sql
b/src/plugins/taskboard/db/20150628-plugin-taskboard-fix-columnbackgroundcolor.sql
new file mode 100644
index 0000000..773d26c
--- /dev/null
+++
b/src/plugins/taskboard/db/20150628-plugin-taskboard-fix-columnbackgroundcolor.sql
@@ -0,0 +1 @@
+update plugin_taskboard_columns set column_background_color = 'White' where
column_background_color = 'none';
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/plugins/taskboard/common/include/TaskBoardHtml.class.php | 4 ++--
src/plugins/taskboard/common/views/admin/columns.php | 4 ++--
.../db/20150628-plugin-taskboard-fix-columnbackgroundcolor.sql | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
create mode 100644
src/plugins/taskboard/db/20150628-plugin-taskboard-fix-columnbackgroundcolor.sql
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
