[Fusionforge-commits] FusionForge branch master updated. 4a4a5e7f2bb41c105fca2ba702b97a9c6427e4d1

Alain Peyrat aljeux at fusionforge.org
Wed May 22 16:06:49 CEST 2013


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  4a4a5e7f2bb41c105fca2ba702b97a9c6427e4d1 (commit)
       via  e53cbcf9c31bd55f7e814aec57fbdef2772cf03f (commit)
      from  6f1873b12fef119379a20fb8c67a3d83bcda0719 (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 -----------------------------------------------------------------
commit 4a4a5e7f2bb41c105fca2ba702b97a9c6427e4d1
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Wed May 22 16:06:05 2013 +0200

    String change

diff --git a/src/common/include/Plugin.class.php b/src/common/include/Plugin.class.php
index 0306d8e..8d6c875 100644
--- a/src/common/include/Plugin.class.php
+++ b/src/common/include/Plugin.class.php
@@ -197,8 +197,8 @@ class Plugin extends Error {
 			if (!is_link(forge_get_config('config_path'). '/plugins/'.$name) && !is_dir(forge_get_config('config_path'). '/plugins/'.$name)) {
 				$code = symlink($path . '/etc/plugins/' . $name, forge_get_config('config_path'). '/plugins/'.$name);
 				if (!$code) {
-					$this->setError('['.forge_get_config('config_path'). '/plugins/'.$name.'->'.$path . '/etc/plugins/' . $name . ']'.
-					_('<br />Config file could not be linked to etc/gforge/plugins/%1$s. Check the write permissions for apache in /etc/gforge/plugins or create the link manually.'), $name);
+					$this->setError('['.forge_get_config('config_path'). '/plugins/'.$name.'->'.$path . '/etc/plugins/' . $name . ']'.'<br />'.
+					_('Config file could not be linked to etc/gforge/plugins/%1$s. Check the write permissions for apache in /etc/gforge/plugins or create the link manually.'), $name);
 				}
 			}
 		}
@@ -214,8 +214,8 @@ class Plugin extends Error {
 			if (!is_link(forge_get_config('config_path'). '/plugins/'.$name) && !is_dir(forge_get_config('config_path'). '/plugins/'.$name)) {
 				$code = symlink($path . '/etc/plugins/' . $name, forge_get_config('config_path'). '/plugins/'.$name);
 				if (!$code) {
-					$this->setError('['.forge_get_config('config_path'). '/plugins/'.$name.'->'.$path . '/etc/plugins/' . $name . ']'.
-					_('<br />Config file could not be linked to etc/gforge/plugins/%1$s. Check the write permissions for apache in /etc/gforge/plugins or create the link manually.'), $name);
+					$this->setError('['.forge_get_config('config_path'). '/plugins/'.$name.'->'.$path . '/etc/plugins/' . $name . ']'.'<br />'.
+					_('Config file could not be linked to etc/gforge/plugins/%1$s. Check the write permissions for apache in /etc/gforge/plugins or create the link manually.'), $name);
 				}
 			}
 		}
@@ -242,7 +242,7 @@ class Plugin extends Error {
 	function groupisactivecheckbox (&$params) {
 		// Check if the group is active
 		// This code creates the checkbox in the project edit public info page
-        // to activate/deactivate the plugin
+		// to activate/deactivate the plugin
 		$display = 1;
 		$title = _('current plugin status is:').' '.forge_get_config('plugin_status', $this->name);
 		$imgStatus = 'plugin_status_valid.png';
@@ -299,7 +299,7 @@ class Plugin extends Error {
 	function userisactivecheckbox(&$params) {
 		// Check if user is active
 		// This code creates the checkbox in the user account maintenance page
-        // to activate/deactivate the plugin
+		// to activate/deactivate the plugin
 		$display = 1;
 		$title = _('current plugin status is:').' '.forge_get_config('plugin_status', $this->name);
 		$imgStatus = 'plugin_status_valid.png';
diff --git a/src/common/survey/SurveyQuestion.class.php b/src/common/survey/SurveyQuestion.class.php
index f9e138a..f764ad3 100644
--- a/src/common/survey/SurveyQuestion.class.php
+++ b/src/common/survey/SurveyQuestion.class.php
@@ -146,7 +146,7 @@ class SurveyQuestion extends Error {
 					      $question_id,
 					      $group_id));
 		if (!$res || db_affected_rows($res) < 1) {
-			$this->setError(_('UPDATE FAILED').db_error());
+			$this->setError(_('Update failed').db_error());
 			return false;
 		}
 		return $this->fetchData($question_id);

commit e53cbcf9c31bd55f7e814aec57fbdef2772cf03f
Author: Alain Peyrat <alain.peyrat at alcatel-lucent.com>
Date:   Wed May 22 16:05:25 2013 +0200

    Use defines in getAvailableTypes() to improve code

diff --git a/src/common/tracker/ArtifactExtraField.class.php b/src/common/tracker/ArtifactExtraField.class.php
index f537787..ec6247d 100644
--- a/src/common/tracker/ArtifactExtraField.class.php
+++ b/src/common/tracker/ArtifactExtraField.class.php
@@ -318,15 +318,15 @@ class ArtifactExtraField extends Error {
 	 */
 	static function getAvailableTypes() {
 		return array(
-			1=>_('Select Box'),
-			2=>_('Check Box'),
-			3=>_('Radio Buttons'),
-			4=>_('Text Field'),
-			5=>_('Multi-Select Box'),
-			6=>_('Text Area'),
-			7=>_('Status'),
-			9=>_('Relation'),
-			10=>_('Integer')
+			ARTIFACT_EXTRAFIELDTYPE_SELECT =>_('Select Box'),
+			ARTIFACT_EXTRAFIELDTYPE_CHECKBOX =>_('Check Box'),
+			ARTIFACT_EXTRAFIELDTYPE_RADIO =>_('Radio Buttons'),
+			ARTIFACT_EXTRAFIELDTYPE_TEXT =>_('Text Field'),
+			ARTIFACT_EXTRAFIELDTYPE_MULTISELECT =>_('Multi-Select Box'),
+			ARTIFACT_EXTRAFIELDTYPE_TEXTAREA =>_('Text Area'),
+			ARTIFACT_EXTRAFIELDTYPE_STATUS =>_('Status'),
+			ARTIFACT_EXTRAFIELDTYPE_RELATION =>_('Relation between artifacts'),
+			ARTIFACT_EXTRAFIELDTYPE_INTEGER =>_('Integer')
 			);
 	}
 

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

Summary of changes:
 src/common/include/Plugin.class.php             |   12 ++++++------
 src/common/survey/SurveyQuestion.class.php      |    2 +-
 src/common/tracker/ArtifactExtraField.class.php |   18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list