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 059774aef3036ecc7840c5304d67d6f5b2e7cd28 (commit)
from 30bea7b8091e47ec6bd9ab1387c885e56b1e7caa (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=059774aef3036ecc7840c5304d67d6f5b2e7cd28
commit 059774aef3036ecc7840c5304d67d6f5b2e7cd28
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Fri Dec 28 16:59:35 2018 +0100
forge cli: userImport, support user status parameter
diff --git a/src/bin/forge b/src/bin/forge
index 3e8e4b9..b6435d7 100755
--- a/src/bin/forge
+++ b/src/bin/forge
@@ -934,6 +934,13 @@ class CliActions {
if (isset($stream['data_array']['user_id'])) {
$importRefMapping['user'][$stream['data_array']['user_id']] = $ffuser->getID();
}
+ if (isset($stream['data_array']['status']) &&
in_array($stream['data_array']['status'], array('P', 'A', 'S', 'D'))) {
+ if
(!$ffuser->setStatus($stream['data_array']['status'])) {
+ echo $ffuser->getErrorMessage()."\n";
+ db_rollback();
+ return false;
+ }
+ }
echo _('User injected')."\n";
db_commit();
return true;
-----------------------------------------------------------------------
Summary of changes:
src/bin/forge | 7 +++++++
1 file changed, 7 insertions(+)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
