[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1394-gc9c4943

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Fri Jan 27 12:30:12 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  c9c49431376d6a1d2a6ef6b4bd07ae6db05b262c (commit)
      from  fa080768ddefa4d3bbeca2c54aacbd82308d6c3d (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=c9c49431376d6a1d2a6ef6b4bd07ae6db05b262c

commit c9c49431376d6a1d2a6ef6b4bd07ae6db05b262c
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Fri Jan 27 12:30:08 2017 +0100

    Whitespace

diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 0e68d9e..dc4af27 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -345,7 +345,6 @@ class ArtifactTypeHtml extends ArtifactType {
 			}
 
 			if ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_SELECT) {
-
 				$str = $this->renderSelect($efarr[$i]['extra_field_id'], $selected[$efarr[$i]['extra_field_id']], $efarr[$i]['show100'], $efarr[$i]['show100label'], $show_any, $text_any, $allowed, $attrs);
 
 			} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_CHECKBOX) {
@@ -698,17 +697,17 @@ class ArtifactTypeHtml extends ArtifactType {
 						$dependency .= (empty($dependency) ? '':', ').'{"field":'.$key.', "elmnt": ['.implode(', ', $cElmnt).']}';
 					}
 					$dependency = '['.$dependency.']';
-					$opt_attrs[$i]= array( 'data-dependency'=>$dependency);
+					$opt_attrs[$i]= array('data-dependency'=>$dependency);
 				}
 			}
 			if ($aef->isAutoAssign()) {
 				$autoAssignTo = UserManager::instance()->getUserById($aefe->getAutoAssignto());
-				$opt_attrs[$i]=array_merge(isset($opt_attrs[$i]) ? $opt_attrs[$i] : array(), array( 'data-autoassignto'=>'{"id":'.$aefe->getAutoAssignto().', "name":"'.$autoAssignTo->getRealName().' ('.$autoAssignTo->getUnixName().')"}'));
+				$opt_attrs[$i]=array_merge(isset($opt_attrs[$i]) ? $opt_attrs[$i] : array(), array('data-autoassignto'=>'{"id":'.$aefe->getAutoAssignto().', "name":"'.$autoAssignTo->getRealName().' ('.$autoAssignTo->getUnixName().')"}'));
 			}
 		}
 
 		if ($show_100 && !empty($aefChildren)) {
-			$attrs_100 = array( 'data-dependency'=>'{"fields": ['.implode(', ', $aefChildren).']}');
+			$attrs_100 = array('data-dependency'=>'{"fields": ['.implode(', ', $aefChildren).']}');
 		}
 		return html_build_select_box_from_arrays($vals, $texts,'extra_fields['.$extra_field_id.']', $checked, $show_100, $text_100, $show_any, $text_any, $allowed, $attrs, $opt_attrs, $attrs_100);
 	}
@@ -798,7 +797,7 @@ class ArtifactTypeHtml extends ArtifactType {
 			$userArray[$checkedUser->getID()] = $checkedUser->getRealName().' '._('[DELETED]');
 		}
 		asort($userArray,SORT_FLAG_CASE | SORT_STRING);
-		$size = min( count($userArray)+1, 15);
+		$size = min(count($userArray)+1, 15);
 		$keys = array_keys($userArray);
 		$vals = array_values($userArray);
 
@@ -896,7 +895,7 @@ class ArtifactTypeHtml extends ArtifactType {
 				}
 			}
 		}
-		$size = min( count($releasesArray) + count($optGroup) + 1, 15);
+		$size = min(count($releasesArray) + count($optGroup) + 1, 15);
 		$keys = array_keys($releasesArray);
 		$vals = array_values($releasesArray);
 		return html_build_multiple_select_box_from_arrays($keys, $vals,'extra_fields['.$extra_field_id.'][]', $checked, $size, $show_100, $text_100, $allowed, $attrs, $releasesAttrs, array(), $optGroup);
@@ -947,11 +946,11 @@ class ArtifactTypeHtml extends ArtifactType {
 			}
 			if ($aef->isAutoAssign()) {
 				$autoAssignTo = UserManager::instance()->getUserById($aefe->getAutoAssignto());
-				$radios_attrs[$i]=array_merge(isset($radios_attrs[$i]) ? $radios_attrs[$i] : array(), array( 'data-autoassignto'=>'{"id":'.$aefe->getAutoAssignto().', "name":"'.$autoAssignTo->getRealName().' ('.$autoAssignTo->getUnixName().')"}'));
+				$radios_attrs[$i]=array_merge(isset($radios_attrs[$i]) ? $radios_attrs[$i] : array(), array('data-autoassignto'=>'{"id":'.$aefe->getAutoAssignto().', "name":"'.$autoAssignTo->getRealName().' ('.$autoAssignTo->getUnixName().')"}'));
 			}
 		}
 		if ($show_100 && !empty($aefChildren)) {
-			$attrs_100 = array( 'data-dependency'=>'{"fields": ['.implode(', ', $aefChildren).']}');
+			$attrs_100 = array('data-dependency'=>'{"fields": ['.implode(', ', $aefChildren).']}');
 		}
 		return html_build_radio_buttons_from_arrays($vals, $texts,'extra_fields['.$extra_field_id.']', $checked, $show_100, $text_100, $show_any, $text_any, $allowed, $attrs, $radios_attrs, $attrs_100);
 	}
@@ -1057,13 +1056,13 @@ class ArtifactTypeHtml extends ArtifactType {
 						$dependency .= (empty($dependency) ? '':', ').'{"field":'.$key.', "elmnt": ['.implode(', ', $cElmnt).']}';
 					}
 					$dependency = '['.$dependency.']';
-					$opt_attrs[$i]= array( 'data-dependency'=>$dependency);
+					$opt_attrs[$i]= array('data-dependency'=>$dependency);
 				}
 			}
 		}
-		$size = min( count($arr)+1, 15);
+		$size = min(count($arr)+1, 15);
 		if ($show_100 && !empty($aefChildren)) {
-			$attrs_100 = array( 'data-dependency'=>'{"fields": ['.implode(', ', $aefChildren).']}');
+			$attrs_100 = array('data-dependency'=>'{"fields": ['.implode(', ', $aefChildren).']}');
 		}
 		return html_build_multiple_select_box_from_arrays($vals, $texts,"extra_fields[$extra_field_id][]", $checked, $size, $show_100, $text_100, $allowed, $attrs, $opt_attrs, $attrs_100);
 	}
@@ -1117,8 +1116,8 @@ class ArtifactTypeHtml extends ArtifactType {
 		// Convert artifact id to links.
 		$html_contents = preg_replace_callback('/\b(\d+)\b/', create_function('$matches', 'return _artifactid2url($matches[1], \'title\');'), $contents);
 		$edit_contents = $this->renderTextField ($extra_field_id, $contents, $size, $maxlength);
-		return html_e('div',array_merge(array( 'id'=>'edit'.$extra_field_id, 'style'=>'display: none', 'title'=>_('Tip: Enter a space-separated list of artifact ids ([#NNN] also accepted)')), $attrs), $edit_contents)
-			.html_e('div',array_merge(array( 'id'=>'show'.$extra_field_id, 'style'=>'display: block'), $attrs), $html_contents);
+		return html_e('div',array_merge(array('id'=>'edit'.$extra_field_id, 'style'=>'display: none', 'title'=>_('Tip: Enter a space-separated list of artifact ids ([#NNN] also accepted)')), $attrs), $edit_contents)
+			.html_e('div',array_merge(array('id'=>'show'.$extra_field_id, 'style'=>'display: block'), $attrs), $html_contents);
 	}
 
 	/**
@@ -1135,7 +1134,6 @@ class ArtifactTypeHtml extends ArtifactType {
 		return html_e('textarea', array_merge(array('name'=>'extra_fields['.$extra_field_id.']', 'rows'=>$rows, 'cols'=>$cols), $attrs), $contents, false);
 	}
 
-
 	/**
 	 * renderDatetime - this function builds a Datetime field.
 	 *
@@ -1214,7 +1212,7 @@ class ArtifactTypeHtml extends ArtifactType {
 		}
 		$contentsFrom = '0U'.$vals[0];
 		$contentsTo = '0U'.$vals[0];
-		if (preg_match('/^(\d+U\d+) ?(\d+U\d+)?$/',$contents,$matches)) {
+		if (preg_match('/^(\d+U\d+) ?(\d+U\d+)?$/', $contents, $matches)) {
 			$contentsFrom = $matches[1];
 			$contentsTo = $matches[2];
 		}
@@ -1296,14 +1294,14 @@ class ArtifactTypeHtml extends ArtifactType {
 			if (!is_array($checked)) {
 				$checked = explode(',', $checked);
 			}
-			$size = min( count($ids)+1, 15);
+			$size = min(count($ids)+1, 15);
 			return html_build_multiple_select_box_from_arrays($ids, $names, $name, $checked, $size, $show_100, $text_100, false, $attrs);
 		} else {
 			return html_build_select_box_from_arrays($ids, $names, $name, $checked, $show_100, $text_100, false, $attrs);
 		}
 	}
 
-	function lastModifierBox ($name='last_modified_by[]', $checked='xzxz', $show_100=true, $text_100='none', $extra_id='-1', $extra_name='', $multiple=false) {
+	function lastModifierBox($name='last_modified_by[]', $checked='xzxz', $show_100=true, $text_100='none', $extra_id='-1', $extra_name='', $multiple=false) {
 		if ($text_100=='none'){
 			$text_100=_('Nobody');
 		}
@@ -1319,7 +1317,7 @@ class ArtifactTypeHtml extends ArtifactType {
 			if (!is_array($checked)) {
 				$checked = explode(',', $checked);
 			}
-			$size = min( count($ids)+1, 15);
+			$size = min(count($ids)+1, 15);
 			return html_build_multiple_select_box_from_arrays($ids, $names, $name, $checked, $size, $show_100, $text_100);
 		} else {
 			return html_build_select_box_from_arrays($ids, $names, $name, $checked, $show_100, $text_100);
@@ -1523,7 +1521,7 @@ class ArtifactTypeHtml extends ArtifactType {
 		});
 	});
 EOS;
-		return html_e('script', array( 'type'=>'text/javascript'), '//<![CDATA['."\n".'$(function(){'.$jsvariable."\n".$javascript.'});'."\n".'//]]>');
+		return html_e('script', array('type'=>'text/javascript'), '//<![CDATA['."\n".'$(function(){'.$jsvariable."\n".$javascript.'});'."\n".'//]]>');
 	}
 
 }

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

Summary of changes:
 .../tracker/include/ArtifactTypeHtml.class.php     | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list