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 21a6db3f2219c42cfb00247ce2ba5f1550b413b5 (commit)
from eff15d56a7c8cfe77c91b1dd198a4ad706159458 (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=21a6db3f2219c42cfb00247ce2ba5f1550b413b5
commit 21a6db3f2219c42cfb00247ce2ba5f1550b413b5
Author: Franck Villaume <[email protected]>
Date: Fri Nov 11 13:56:25 2016 +0100
add missing last_modify_by in export CSV & SOAP, fix
flattedartifacts_to_soap to return real flatted data
diff --git a/src/common/tracker/actions/downloadcsv.php
b/src/common/tracker/actions/downloadcsv.php
index 9c47de2..d6a73fc 100644
--- a/src/common/tracker/actions/downloadcsv.php
+++ b/src/common/tracker/actions/downloadcsv.php
@@ -77,6 +77,7 @@ if ($headers) {
'open_date'.$sep.
'close_date'.$sep.
'last_modified_date'.$sep.
+ 'last_modified_by'.$sep.
'summary'.$sep.
'details'.$sep.
'_votes'.$sep.
@@ -112,6 +113,7 @@ for ($i=0; $i<count($at_arr); $i++) {
'"'.$open_date.'"'.$sep.
'"'.$close_date.'"'.$sep.
'"'.$update_date.'"'.$sep.
+ '"'.$at_arr[$i]-->getLastModifiedRealName().'"'.$sep.
'"'.fix4csv($at_arr[$i]->getSummary()).'"'.$sep.
'"'.fix4csv($at_arr[$i]->getDetails()).'"'.$sep.
$votes[0].$sep.
diff --git a/src/www/soap/tracker/tracker.php b/src/www/soap/tracker/tracker.php
index aefe8f8..96726fc 100644
--- a/src/www/soap/tracker/tracker.php
+++ b/src/www/soap/tracker/tracker.php
@@ -176,6 +176,7 @@ $server->wsdl->addComplexType(
'assigned_to' => array('name'=>'assigned_to', 'type' =>
'xsd:int'),
'open_date' => array('name'=>'open_date', 'type' => 'xsd:int'),
'last_modified_date' => array('name'=>'last_modified_date',
'type' => 'xsd:int'),
+ 'last_modified_by' => => array('name'=>'last_modified_by',
'type' => 'xsd:int'),
'close_date' => array('name'=>'close_date', 'type' =>
'xsd:int'),
'summary' => array('name'=>'summary', 'type' => 'xsd:string'),
'details' => array('name'=>'details', 'type' => 'xsd:string'),
@@ -249,10 +250,11 @@ $server->wsdl->addComplexType(
'group_artifact_id' => array('name'=>'group_artifact_id',
'type' => 'xsd:int'),
'status_id' => array('name'=>'status_id', 'type' => 'xsd:int'),
'priority' => array('name'=>'priority', 'type' => 'xsd:int'),
- 'submitted_by' => array('name'=>'submitted_by', 'type' =>
'xsd:int'),
- 'assigned_to' => array('name'=>'assigned_to', 'type' =>
'xsd:int'),
+ 'submitted_by' => array('name'=>'submitted_by', 'type' =>
'xsd:string'),
+ 'assigned_to' => array('name'=>'assigned_to', 'type' =>
'xsd:string'),
'open_date' => array('name'=>'open_date', 'type' => 'xsd:int'),
'last_modified_date' => array('name'=>'last_modified_date',
'type' => 'xsd:int'),
+ 'last_modified_by' => => array('name'=>'last_modified_by',
'type' => 'xsd:string'),
'close_date' => array('name'=>'close_date', 'type' =>
'xsd:int'),
'summary' => array('name'=>'summary', 'type' => 'xsd:string'),
'details' => array('name'=>'details', 'type' => 'xsd:string'),
@@ -917,6 +919,7 @@ function artifacts_to_soap($at_arr) {
'assigned_to'=>$at_arr[$i]->data_array['assigned_to'],
'open_date'=>$at_arr[$i]->data_array['open_date'],
'last_modified_date'=>$at_arr[$i]->data_array['last_modified_date'],
+
'last_modified_by'=>$at_arr[$i]->data_array['last_modified_by'],
'close_date'=>$at_arr[$i]->data_array['close_date'],
'summary'=>$at_arr[$i]->data_array['summary'],
'details'=>$at_arr[$i]->data_array['details'],
@@ -965,10 +968,11 @@ function flattedartifacts_to_soap($at_arr) {
'group_artifact_id'=>$at_arr[$i]->data_array['group_artifact_id'],
'status_id'=>$at_arr[$i]->data_array['status_id'],
'priority'=>$at_arr[$i]->data_array['priority'],
-
'submitted_by'=>$at_arr[$i]->data_array['submitted_by'],
-
'assigned_to'=>$at_arr[$i]->data_array['assigned_to'],
+
'submitted_by'=>$at_arr[$i]->data_array['submitted_realname'],
+
'assigned_to'=>$at_arr[$i]->data_array['assigned_realname'],
'open_date'=>$at_arr[$i]->data_array['open_date'],
'last_modified_date'=>$at_arr[$i]->data_array['last_modified_date'],
+
'last_modified_by'=>$at_arr[$i]->data_array['last_modified_realname'],
'close_date'=>$at_arr[$i]->data_array['close_date'],
'summary'=>$at_arr[$i]->data_array['summary'],
'details'=>$at_arr[$i]->data_array['details'],
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/downloadcsv.php | 2 ++
src/www/soap/tracker/tracker.php | 12 ++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits