[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1437-gd2aef94

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Fri Feb 10 13:53:45 CET 2017


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  d2aef94da82e03b764f384e29e50d4747e0e629a (commit)
      from  b7808bcd5659f9f734594fb764e2e5434f27c2d2 (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=d2aef94da82e03b764f384e29e50d4747e0e629a

commit d2aef94da82e03b764f384e29e50d4747e0e629a
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Fri Feb 10 13:53:40 2017 +0100

    Add <label>

diff --git a/src/common/tracker/views/form-adminroadmap.php b/src/common/tracker/views/form-adminroadmap.php
index 4e8cc0b..df11c3c 100644
--- a/src/common/tracker/views/form-adminroadmap.php
+++ b/src/common/tracker/views/form-adminroadmap.php
@@ -71,26 +71,22 @@ if (getStringFromRequest('set_roadmap')) {
 
 	if (! $roadmap_name) {
 		$error_msg .= _("Cannot create or rename roadmap")._(': ')._('name is empty');
-	}
-	else {
+	} else {
 		$roadmap = new Roadmap($group, $roadmap_id);
 		if (! $roadmap_id) {
 			$result = $roadmap->create($roadmap_name);
 			if ($result) {
 				$feedback .= sprintf(_('Roadmap %s created'), $roadmap_name);
-			}
-			else {
+			} else {
 				$error_msg .= _("Cannot create roadmap")._(': ').$roadmap->getErrorMessage();
 			}
-		}
-		else {
+		} else {
 			$old_roadmap_name = $roadmap->getName();
 			if ($roadmap_name != $old_roadmap_name) {
 				$result = $roadmap->rename($roadmap_name);
 				if ($result) {
 					$feedback .= sprintf(_('Roadmap %s renamed to %s'), $old_roadmap_name, $roadmap_name);
-				}
-				else {
+				} else {
 					$error_msg .= _("Cannot rename roadmap")._(': ').$roadmap->getErrorMessage();
 				}
 			}
@@ -105,8 +101,7 @@ if (getStringFromRequest('set_roadmap')) {
 	if ($error_msg) {
 		$set_roadmap_failed = true;
 	}
-}
-elseif (getStringFromRequest('set_roadmap_state')) {
+} elseif (getStringFromRequest('set_roadmap_state')) {
 	$roadmap_states = getArrayFromRequest('roadmap_states');
 	$default_roadmap = getIntFromRequest('default_roadmap');
 
@@ -134,16 +129,14 @@ elseif (getStringFromRequest('set_roadmap_state')) {
 			}
 		}
 	}
-}
-elseif (getStringFromRequest('delete_roadmap_sure')) {
+} elseif (getStringFromRequest('delete_roadmap_sure')) {
 	$roadmap_id = getIntFromRequest('roadmap_id', 0);
 
 	$roadmap = new Roadmap($group, $roadmap_id);
 	$result = $roadmap->delete();
 	if ($result) {
 		$feedback .= sprintf(_('Roadmap %s is deleted'), $roadmap->getName());
-	}
-	else {
+	} else {
 		$error_msg .= _("Cannot delete roadmap")._(': ').$roadmap->getErrorMessage();
 	}
 }
@@ -187,8 +180,7 @@ if ($set_roadmap_failed ||
 
 	if (getStringFromRequest('new_roadmap')) {
 		$atfh->header(array('title' => _('Create a new roadmap'), 'modal' => 1));
-	}
-	else {
+	} else {
 		$atfh->header(array('title' => _('Update roadmap'), 'modal' => 1));
 	}
 
@@ -203,8 +195,8 @@ if ($set_roadmap_failed ||
 		}
 		echo $HTML->listTableTop();
 		$cells = array();
-		$cells[][] = _('Name')._(':');
-		$cells[][] = html_e('input', array('required' => 'required', 'type' => 'text', 'name' => 'roadmap_name', 'value' => $roadmap->getName(), 'size' => 40));
+		$cells[][] = '<label for="roadmap_name">'._('Name')._(':').'</label>';
+		$cells[][] = html_e('input', array('required' => 'required', 'type' => 'text', 'id' => 'roadmap_name', 'name' => 'roadmap_name', 'value' => $roadmap->getName(), 'size' => 40));
 		echo $HTML->multiTableRow(array(), $cells);
 
 		foreach ($at_arr as $artifact_type) {
@@ -255,8 +247,7 @@ if (getIntFromRequest('manage_release') ||
 	$selected_roadmap = $roadmap_factory->getRoadmapByID($roadmap_id);
 	if (! is_object($selected_roadmap)) {
 		$error_msg .= sprintf(_('roadmap %s is not available'), 'ID='.$roadmap_id);
-	}
-	else {
+	} else {
 		$artifact_type_list = $selected_roadmap->getList();
 
 		$update_order = 0;
@@ -283,15 +274,12 @@ if (getIntFromRequest('manage_release') ||
 				$result = $selected_roadmap->setReleaseOrder($release_order);
 				if ($result) {
 					$feedback .= _('Release(s) order updated');
-				}
-				else {
+				} else {
 					$error_msg .= _("Cannot modify release order")._(': ').$selected_roadmap->getErrorMessage();
 				}
-			}
-			elseif (getStringFromRequest('release_auto_order')) {
+			} elseif (getStringFromRequest('release_auto_order')) {
 				usort($release_order, 'version_compare');
-			}
-			elseif (getStringFromRequest('release_changes_order')) {
+			} elseif (getStringFromRequest('release_changes_order')) {
 				$order = array_reverse(getArrayFromRequest('order'));
 
 				// Items with not modified positions
@@ -313,13 +301,11 @@ if (getIntFromRequest('manage_release') ||
 						if (!isset($out_before[$new_pos]))
 							$out_before[$new_pos] = array();
 						$out_before[$new_pos][] = $field;
-					}
-					elseif ($new_pos > $list_size) {
+					} elseif ($new_pos > $list_size) {
 						if (!isset($out_after[$new_pos]))
 							$out_after[$new_pos] = array();
 						$out_after[$new_pos][] = $field;
-					}
-					else {
+					} else {
 						if (!isset($changed[$new_pos - 1]))
 							$changed[$new_pos - 1] = array();
 						$changed[$new_pos - 1][] = $field;
@@ -370,8 +356,7 @@ if (getIntFromRequest('manage_release') ||
 			$result = $selected_roadmap->setReleaseOrder($release_order);
 			if ($result) {
 				$feedback .= _('Release(s) order updated');
-			}
-			else {
+			} else {
 				$error_msg .= _("Cannot modify release order")._(': ').$selected_roadmap->getErrorMessage();
 			}
 		}
@@ -423,8 +408,7 @@ if (getIntFromRequest('manage_release') ||
 				  </tr>';
 			echo $HTML->listTableBottom();
 			echo $HTML->closeForm();
-		}
-		else {
+		} else {
 			echo '<p>'._('No tracker is selected for this roadmap').'.</p>';
 			echo '<p>'._('You can '). util_make_link('/tracker/admin/?group_id='.$group_id.'&roadmap_id='.$roadmap_id.'&admin_roadmap=1&update_roadmap=1', _('select tracker(s) for this roadmap')).
 				'</p>';

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

Summary of changes:
 src/common/tracker/views/form-adminroadmap.php | 52 +++++++++-----------------
 1 file changed, 18 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list