[Fusionforge-commits] FusionForge branch master updated. 6.0.4-1122-g712a802

[Franck Villaume]

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  712a802ce9b7c14817cc6851125179f84c144234 (commit)
       via  07e246d9696970484c9257e705bc049dad018a5e (commit)
      from  fdc2d3831a0ddf2c952bf1536ae12a3962dfc540 (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=712a802ce9b7c14817cc6851125179f84c144234

commit 712a802ce9b7c14817cc6851125179f84c144234
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Nov 3 23:44:30 2016 +0100

    tracker: fix downloadcsv action according to ArtifactFactory setup function

diff --git a/src/common/tracker/actions/downloadcsv.php b/src/common/tracker/actions/downloadcsv.php
index dda1162..a2bee3a 100644
--- a/src/common/tracker/actions/downloadcsv.php
+++ b/src/common/tracker/actions/downloadcsv.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * Copyright 2005 (c) GForge Group, LLC
+ * Copyright 2016, Franck Villaume - TrivialDev
+ * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
  * you can redistribute it and/or modify it under the terms of the
@@ -45,11 +47,11 @@ $_sort_col = getStringFromRequest('_sort_col');
 $_sort_ord = getStringFromRequest('_sort_ord');
 $max_rows = getIntFromRequest('max_rows');
 $set = getStringFromRequest('set');
-$_assigned_to = getStringFromRequest('_assigned_to');
-$_status = getStringFromRequest('_status');
-$_changed_from = getStringFromRequest('_changed_from');
+$_assigned_to = getIntFromRequest('_assigned_to');
+$_status = getIntFromRequest('_status');
+$_changed_from = getIntFromRequest('_changed_from', 0);
 
-$af->setup($offset,$_sort_col,$_sort_ord,$max_rows,$set,$_assigned_to,$_status,$_changed_from);
+$af->setup($offset,$_sort_col,$_sort_ord,$max_rows,$set,$_assigned_to,$_status, array(), $_changed_from);
 
 $at_arr = $af->getArtifacts();
 

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=07e246d9696970484c9257e705bc049dad018a5e

commit 07e246d9696970484c9257e705bc049dad018a5e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Nov 3 23:43:40 2016 +0100

    SOAP: getArtifacts tracker function, support changed_from parameter to set limit in time of retrieved artifacts

diff --git a/src/CHANGES b/src/CHANGES
index 94b623d..da7fe10 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -22,6 +22,7 @@ FusionForge 6.X:
 * Search: provide language-specific settings for better indexation/search (Roland Mas)
 * Site Admin: add paging system in userlist page [#799] (TrivialDev)
 * Site Admin: support widgets for forge home page (TrivialDev)
+* Soap: getArtifacts tracker function: support changed_from parameter (TrivialDev)
 * Spellcheck (Anders Jonsson)
 * Taskboard: support multiple taskboards per project [#785] (TrivialDev)
 * Taskboard: support filtering tasks [#786] (TrivialDev)
diff --git a/src/common/tracker/ArtifactFactory.class.php b/src/common/tracker/ArtifactFactory.class.php
index d897708..07a7523 100644
--- a/src/common/tracker/ArtifactFactory.class.php
+++ b/src/common/tracker/ArtifactFactory.class.php
@@ -94,8 +94,9 @@ class ArtifactFactory extends FFError {
 	 * @param	int	$_assigned_to	Include this param if you want to limit to a certain assignee.
 	 * @param	int	$_status	Include this param if you want to limit to a particular status.
 	 * @param	array	$_extra_fields	Array of extra fields & elements to limit the query to.
+	 * @param	int	$_changed_from	Set this param if you want to limit to a specific range of time (now minus _changed_from int value)
 	 */
-	function setup($offset,$order_col,$sort,$max_rows,$set,$_assigned_to,$_status,$_extra_fields=array()) {
+	function setup($offset, $order_col, $sort, $max_rows, $set, $_assigned_to, $_status, $_extra_fields = array(), $_changed_from = 0) {
 
 		if ((!$offset) || ($offset < 0)) {
 			$this->offset=0;
@@ -258,6 +259,10 @@ class ArtifactFactory extends FFError {
 			}
 			$_changed=0;
 		}
+		//ugly hack to force _changed value to parameter
+		if ($_changed_from) {
+			$_changed = $_changed_from;
+		}
 
 		$this->sort=$_sort_ord;
 		$this->order_col=$_order_col;
diff --git a/src/www/soap/tracker/tracker.php b/src/www/soap/tracker/tracker.php
index 67afba6..cad230a 100644
--- a/src/www/soap/tracker/tracker.php
+++ b/src/www/soap/tracker/tracker.php
@@ -202,7 +202,8 @@ $server->register(
 		'group_id'=>'xsd:int',
 		'group_artifact_id'=>'xsd:int',
 		'assigned_to'=>'xsd:int',
-		'status'=>'xsd:int'
+		'status'=>'xsd:int',
+		'changed_from' => 'xsd:int'
 	),
 	array('getArtifactsResponse'=>'tns:ArrayOfArtifact'),
 	$uri,$uri.'#getArtifacts','rpc','encoded'
@@ -696,7 +697,7 @@ function getArtifactTechnicians($session_ser,$group_id,$group_artifact_id) {
 //
 //	getArtifacts
 //
-function getArtifacts($session_ser,$group_id,$group_artifact_id,$assigned_to,$status) {
+function getArtifacts($session_ser, $group_id, $group_artifact_id, $assigned_to, $status, $changed_from) {
 	continue_session($session_ser);
 	$grp = group_get_object($group_id);
 	if (!$grp || !is_object($grp)) {
@@ -726,7 +727,7 @@ function getArtifacts($session_ser,$group_id,$group_artifact_id,$assigned_to,$st
 		$set = false;
 	}
 
-	$af->setup(0,'','',0,$set,$assigned_to,$status);
+	$af->setup(0, '', '', 0, $set, $assigned_to, $status, array(), $changed_from);
 	$artifacts = $af->getArtifacts();
 	if ($artifacts === false) {
 		return new soap_fault('','getArtifacts',$af->getErrorMessage(),$af->getErrorMessage());

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

Summary of changes:
 src/CHANGES                                  |  1 +
 src/common/tracker/ArtifactFactory.class.php |  7 ++++++-
 src/common/tracker/actions/downloadcsv.php   | 10 ++++++----
 src/www/soap/tracker/tracker.php             |  7 ++++---
 4 files changed, 17 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
FusionForge