[Fusionforge-commits] FusionForge branch master updated. 6.0.4-779-gb9b4130

Franck Villaume nerville at libremir.placard.fr.eu.org
Fri Aug 19 09:55:50 CEST 2016


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  b9b4130662ccffac2b4ab4dee507a7880574a46d (commit)
      from  8f22078721b21ff89ed02a63e23d049bfd76a0a3 (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=b9b4130662ccffac2b4ab4dee507a7880574a46d

commit b9b4130662ccffac2b4ab4dee507a7880574a46d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Aug 19 09:55:37 2016 +0200

    coding style

diff --git a/src/common/tracker/ArtifactType.class.php b/src/common/tracker/ArtifactType.class.php
index 7045977..2cdbc7d 100644
--- a/src/common/tracker/ArtifactType.class.php
+++ b/src/common/tracker/ArtifactType.class.php
@@ -604,6 +604,8 @@ class ArtifactType extends FFError {
 	 * set up for this artifact type.
 	 *
 	 * @param	array	$types
+	 * @param	bool	$get_is_disabled
+	 * @param	bool	$get_is_hidden_on_submit
 	 * @return	array	arrays of data;
 	 */
 	function getExtraFields($types = array(), $get_is_disabled = false, $get_is_hidden_on_submit = true) {
diff --git a/src/www/soap/tracker/tracker.php b/src/www/soap/tracker/tracker.php
index 96985d2..17a14ab 100644
--- a/src/www/soap/tracker/tracker.php
+++ b/src/www/soap/tracker/tracker.php
@@ -4,6 +4,7 @@
  *
  * Copyright 2004 (c) GForge, LLC
  * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2016, Franck Villaume - TrivialDev
  * http://gforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -101,15 +102,15 @@ $server->wsdl->addComplexType(
 	'sequence',
 	'',
 	array(
-	'group_artifact_id' => array('name'=>'group_artifact_id', 'type' => 'xsd:int'),
-	'group_id' => array('name'=>'group_id', 'type' => 'xsd:int'),
-	'name' => array('name'=>'name', 'type' => 'xsd:string'),
-	'description' => array('name'=>'description', 'type' => 'xsd:string'),
-	'due_period' => array('name'=>'due_period', 'type' => 'xsd:int'),
-	'datatype' => array('name'=>'datatype', 'type' => 'xsd:int'),
-	'status_timeout' => array('name'=>'status_timeout', 'type' => 'xsd:int'),
-	'extra_fields' => array('name' => 'extra_fields', 'type' => 'tns:ArrayOfArtifactExtraField'),
-	'custom_status_field' => array('name' => 'custom_status_field', 'type' => 'xsd:int'),
+		'group_artifact_id' => array('name'=>'group_artifact_id', 'type' => 'xsd:int'),
+		'group_id' => array('name'=>'group_id', 'type' => 'xsd:int'),
+		'name' => array('name'=>'name', 'type' => 'xsd:string'),
+		'description' => array('name'=>'description', 'type' => 'xsd:string'),
+		'due_period' => array('name'=>'due_period', 'type' => 'xsd:int'),
+		'datatype' => array('name'=>'datatype', 'type' => 'xsd:int'),
+		'status_timeout' => array('name'=>'status_timeout', 'type' => 'xsd:int'),
+		'extra_fields' => array('name' => 'extra_fields', 'type' => 'tns:ArrayOfArtifactExtraField'),
+		'custom_status_field' => array('name' => 'custom_status_field', 'type' => 'xsd:int'),
 	)
 );
 
@@ -121,7 +122,8 @@ $server->wsdl->addComplexType(
 	'SOAP-ENC:Array',
 	array(),
 	array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:ArtifactType[]')),
-	'tns:ArtifactType');
+	'tns:ArtifactType'
+);
 
 $server->register(
 	'getArtifactTypes',
@@ -141,8 +143,8 @@ $server->wsdl->addComplexType(
 	'sequence',
 	'',
 	array(
-	'extra_field_id' => array('name'=>'extra_field_id', 'type' => 'xsd:int'),
-	'field_data' => array('name'=>'field_data', 'type' => 'xsd:string')
+		'extra_field_id' => array('name'=>'extra_field_id', 'type' => 'xsd:int'),
+		'field_data' => array('name'=>'field_data', 'type' => 'xsd:string')
 	)
 );
 
@@ -253,14 +255,14 @@ $server->wsdl->addComplexType(
 	'sequence',
 	'',
 	array(
-	'id' => array('name'=>'id', 'type' => 'xsd:int'),
-	'artifact_id' => array('name'=>'artifact_id', 'type' => 'xsd:int'),
-	'name' => array('name'=>'name', 'type' => 'xsd:string'),
-	'description' => array('name'=>'description', 'type' => 'xsd:string'),
-	'filesize' => array('name'=>'filesize', 'type' => 'xsd:int'),
-	'filetype' => array('name'=>'filetype', 'type' => 'xsd:string'),
-	'adddate' => array('name'=>'adddate', 'type' => 'xsd:int'),
-	'submitted_by' => array('name'=>'submitted_by', 'type' => 'xsd:int')
+		'id' => array('name'=>'id', 'type' => 'xsd:int'),
+		'artifact_id' => array('name'=>'artifact_id', 'type' => 'xsd:int'),
+		'name' => array('name'=>'name', 'type' => 'xsd:string'),
+		'description' => array('name'=>'description', 'type' => 'xsd:string'),
+		'filesize' => array('name'=>'filesize', 'type' => 'xsd:int'),
+		'filetype' => array('name'=>'filetype', 'type' => 'xsd:string'),
+		'adddate' => array('name'=>'adddate', 'type' => 'xsd:int'),
+		'submitted_by' => array('name'=>'submitted_by', 'type' => 'xsd:int')
 	)
 );
 
@@ -292,15 +294,16 @@ $server->register(
 
 $server->register(
 	'addArtifactFile',
-	array(	'session_ser'=>'xsd:string',
-			'group_id'=>'xsd:int',
-			'group_artifact_id'=>'xsd:int',
-			'artifact_id'=>'xsd:int',
-			'base64_contents'=>'xsd:string',
-			'description'=>'xsd:string',
-			'filename'=>'xsd:string',
-			'filetype'=>'xsd:string'
-		),
+	array(
+		'session_ser'=>'xsd:string',
+		'group_id'=>'xsd:int',
+		'group_artifact_id'=>'xsd:int',
+		'artifact_id'=>'xsd:int',
+		'base64_contents'=>'xsd:string',
+		'description'=>'xsd:string',
+		'filename'=>'xsd:string',
+		'filetype'=>'xsd:string'
+	),
 	array('addArtifactFileResponse'=>'xsd:int'),
 	$uri,$uri.'#addArtifactFile','rpc','encoded'
 );
@@ -748,10 +751,10 @@ function artifacts_to_soap($at_arr) {
 			if ($at_arr[$i]->isError()) {
 				//skip if error
 			} else {
-	//NEEDS THOROUGH COMMENTS AND EXPLANATION
-		//***********
-		// Retrieving the artifact details
-		//**checks whether there is any artifact details exists for this object, if not continue with next loop
+				//NEEDS THOROUGH COMMENTS AND EXPLANATION
+				//***********
+				// Retrieving the artifact details
+				//**checks whether there is any artifact details exists for this object, if not continue with next loop
 
 				if(count($at_arr[$i]) < 1) { continue; }
 				$flddata=array();
@@ -1128,11 +1131,10 @@ function artifact_history_to_soap($db_result, &$artifactType) {
 
 		$result[] = array(
 					"field_name"	=> $field_name,
-					"old_value"		=> $old_value,
-					"date"			=> $date,
-					"user_name"		=> $user_name
-					);
+					"old_value"	=> $old_value,
+					"date"		=> $date,
+					"user_name"	=> $user_name
+				);
 	}
-
 	return $result;
 }

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

Summary of changes:
 src/common/tracker/ArtifactType.class.php |  2 +
 src/www/soap/tracker/tracker.php          | 78 ++++++++++++++++---------------
 2 files changed, 42 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list