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 2030b4edb2af0258fefabb0b1a338788aee2b800 (commit)
via c0dc3b301e11eac4f34e06afc9cf5bc84bca74af (commit)
from eca8d87d68606f72947819d78e793849626a473d (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=2030b4edb2af0258fefabb0b1a338788aee2b800
commit 2030b4edb2af0258fefabb0b1a338788aee2b800
Author: Franck Villaume <[email protected]>
Date: Sun Mar 5 17:59:57 2017 +0100
forge cli: artifactDump better support
diff --git a/src/bin/forge b/src/bin/forge
index c276496..1dd13a4 100755
--- a/src/bin/forge
+++ b/src/bin/forge
@@ -150,7 +150,7 @@ class CliActions {
$artifactDump['history'] = array();
$hist = $artf->getHistory();
if (db_numrows($hist) > 0) {
- while ($arr =
db_fetch_array($hist, null, PGSQL_ASSOC)) {
+ while ($arr =
db_fetch_array($hist, PGSQL_ASSOC)) {
$artifactDump['history'][] = $arr;
}
}
@@ -161,18 +161,24 @@ class CliActions {
$artifactDump['messages'] = array();
$messages = $artf->getMessages();
if (db_numrows($messages) > 0) {
- while ($arr =
db_fetch_array($messages, null, PGSQL_ASSOC)) {
-
$artifactDump['messages'] = $arr;
+ while ($arr =
db_fetch_array($messages, PGSQL_ASSOC)) {
+
$artifactDump['messages'][] = $arr;
}
}
- $artifactDump['files'] =
$artf->getFiles();
- $artifactDump['tasks'] = array();
+ $files = $artf->getFiles();
+ foreach ($files as $file) {
+ unset($file->Artifact);
+
$artifactDump['artifact']['files'][] = (array)$file;
+ }
+
$artifactDump['artifact']['relatedtasks'] = array();
$tasks = $artf->getRelatedTasks();
if (db_numrows($tasks) > 0) {
- while ($arr =
db_fetch_array($tasks, null, PGSQL_ASSOC)) {
-
$artifactDump['tasks'][] = $arr;
+ while ($arr =
db_fetch_array($tasks, PGSQL_ASSOC)) {
+
$artifactDump['artifact']['relatedtasks'][] = $arr;
}
}
+ $artifactDump['artifact']['votes'] =
$artf->getVotes();
+
$artifactDump['artifact']['extra_field_data'] = $artf->getExtraFieldDataText();
break;
default:
$artifactDump['error'][] = _('Unknown
function');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c0dc3b301e11eac4f34e06afc9cf5bc84bca74af
commit c0dc3b301e11eac4f34e06afc9cf5bc84bca74af
Author: Franck Villaume <[email protected]>
Date: Sun Mar 5 17:59:14 2017 +0100
add missing require
diff --git a/src/common/tracker/Artifact.class.php
b/src/common/tracker/Artifact.class.php
index ee72070..6e50dd1 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -48,6 +48,7 @@
* ALONE BASIS."
*/
require_once $gfcommon.'include/FFObject.class.php';
+require_once $gfcommon.'tracker/ArtifactFile.class.php';
require_once $gfcommon.'tracker/ArtifactMessage.class.php';
require_once $gfcommon.'tracker/ArtifactExtraField.class.php';
require_once $gfcommon.'tracker/ArtifactWorkflow.class.php';
-----------------------------------------------------------------------
Summary of changes:
src/bin/forge | 20 +++++++++++++-------
src/common/tracker/Artifact.class.php | 1 +
2 files changed, 14 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
