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 4f6274dd604c7654414e83fd8f3c6216dfded45c (commit)
via 359a6f3c02ddacc6ce8f998a8ba4db84b4a88b22 (commit)
from 7afb551995a945bab4edb6e8895903463e762d27 (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=4f6274dd604c7654414e83fd8f3c6216dfded45c
commit 4f6274dd604c7654414e83fd8f3c6216dfded45c
Author: Franck Villaume <[email protected]>
Date: Sun May 28 18:29:37 2017 +0200
forge cli: dump effort units for groupDump & trackerDump
diff --git a/src/bin/forge b/src/bin/forge
index a07a335..8b5eb1c 100755
--- a/src/bin/forge
+++ b/src/bin/forge
@@ -27,6 +27,7 @@ require (dirname(__FILE__).'/../common/include/env.inc.php');
require_once $gfcommon.'include/pre.php';
require_once $gfcommon.'tracker/ArtifactFactory.class.php';
require_once $gfcommon.'tracker/ArtifactTypeFactory.class.php';
+require_once $gfcommon.'tracker/EffortUnitFactory.class.php';
require_once $gfcommon.'docman/DocumentReviewFactory.class.php';
require_once $gfcommon.'include/User.class.php';
@@ -369,6 +370,9 @@ class CliActions {
$role->userids[] = $user->getID();
}
}
+ $effortUnitSet = new EffortUnitSet($group,
$group->getEffortUnitSet());
+ $unitFactory = new EffortUnitFactory($effortUnitSet);
+ $groupDump['setup']['units_set'] =
$unitFactory->getUnitsData();
$groupDump['setup']['homepage'] =
$group->getWidgetLayoutConfig();
if ($group->usesDocman()) {
$groupDump['docman'] =
$this->docmanDump($group_id, 'return');
@@ -897,6 +901,9 @@ class CliActions {
$at = artifactType_get_object($atid);
if ($at && is_object($at) && !$at->isError()) {
$trackerDump['setup'] = $at->getSettings();
+ $effortUnitSet = new EffortUnitSet($at,
$at->getEffortUnitSet());
+ $unitFactory = new EffortUnitFactory($effortUnitSet);
+ $trackerDump['setup']['units_set'] =
$unitFactory->getUnitsData();
$af = new ArtifactFactory($at);
if ($af && is_object($af) && !$at->isError()) {
$af->setup(0, '', '', 0, 'overwrite', false,
false, array(), false);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=359a6f3c02ddacc6ce8f998a8ba4db84b4a88b22
commit 359a6f3c02ddacc6ce8f998a8ba4db84b4a88b22
Author: Franck Villaume <[email protected]>
Date: Sun May 28 18:29:09 2017 +0200
clean-up
diff --git a/src/common/tracker/EffortUnit.class.php
b/src/common/tracker/EffortUnit.class.php
index b104641..2e789f6 100644
--- a/src/common/tracker/EffortUnit.class.php
+++ b/src/common/tracker/EffortUnit.class.php
@@ -66,7 +66,7 @@ class EffortUnit extends FFError {
if (db_numrows($res) < 1) {
//function in class we extended
$this->setError(_('Effort Unit Not
Found'));
- $this->data_array=array();
+ $this->data_array = array();
return;
} else {
//set up an associative array for use
by other functions
diff --git a/src/common/tracker/EffortUnitFactory.class.php
b/src/common/tracker/EffortUnitFactory.class.php
index 882b030..98d7508 100644
--- a/src/common/tracker/EffortUnitFactory.class.php
+++ b/src/common/tracker/EffortUnitFactory.class.php
@@ -97,7 +97,7 @@ class EffortUnitFactory extends FFError {
return false;
}
foreach ($unitsArr as $unitArr) {
- $unit = new EffortUnit($this->EffortUnitSet, true,
$unitArr);
+ $unit = new EffortUnit($this->EffortUnitSet,
$unitArr['unit_id'], $unitArr);
if (!$unit && $unit->isError()) {
$this->setError($unit->getErrorMessage());
return false;
@@ -121,7 +121,7 @@ class EffortUnitFactory extends FFError {
return false;
}
foreach ($unitsArr as $unitArr) {
- $result[$unitArr['unit_id']]=$unitArr['unit_name'];
+ $result[$unitArr['unit_id']] = $unitArr['unit_name'];
}
return $result ;
}
diff --git a/src/common/tracker/EffortUnitSet.class.php
b/src/common/tracker/EffortUnitSet.class.php
index 9bc5d72..bc4f2b5 100644
--- a/src/common/tracker/EffortUnitSet.class.php
+++ b/src/common/tracker/EffortUnitSet.class.php
@@ -63,7 +63,7 @@ class EffortUnitSet extends FFError {
parent::__construct();
$this->Object = $Object;
if (!$Object) {
- $class ='';
+ $class = '';
} else {
$class = get_class($Object);
}
@@ -190,7 +190,7 @@ class EffortUnitSet extends FFError {
* @param EffortUnitSet $from_unit_set Effort Unit Set to be
copied
* @return bool success or not
*/
- function copy($from_unit_set){
+ function copy($from_unit_set) {
db_begin();
$unit_set_id = $this->create();
if (!$unit_set_id) {
@@ -359,7 +359,7 @@ class EffortUnitSet extends FFError {
*
* @return boolean true/false.
*/
- function isEquivalentTo($effortUnitSet){
+ function isEquivalentTo($effortUnitSet) {
if ($this->getID() == $effortUnitSet->getID()) {
return true;
}
@@ -391,7 +391,7 @@ class EffortUnitSet extends FFError {
*
* @return boolean true/false.
*/
- function isAutoconvert(){
+ function isAutoconvert() {
return ($this->data_array['is_autoconvert']? true : false);
}
@@ -401,7 +401,7 @@ class EffortUnitSet extends FFError {
* @param boolean $is_autoconvert set if unit is auto
convert
* @return boolean true/false.
*/
- function update($is_autoconvert){
+ function update($is_autoconvert) {
$res = db_query_params ('UPDATE effort_unit_set SET
is_autoconvert=$1 WHERE unit_set_id=$2',
array (($is_autoconvert?1:0), $this->getID())) ;
if (!$res) {
diff --git a/src/common/tracker/actions/effort_units.php
b/src/common/tracker/actions/effort_units.php
index d6314a2..3a83ae4 100644
--- a/src/common/tracker/actions/effort_units.php
+++ b/src/common/tracker/actions/effort_units.php
@@ -43,7 +43,7 @@ if (!$atid && !$group_id) {
// Forge level
session_require_global_perm('forge_admin');
$title = _('Effort Units for the Forge');
- $headerArr = array('title'=>$title);
+ $headerArr = array('title' => $title);
site_admin_header($headerArr);
// hardcode
$unitSetId = 1;
@@ -64,7 +64,7 @@ if (!$atid && !$group_id) {
$title = _('Effort Units for project').' '.$group->getPublicName();
- $headerArr = array('title'=>$title, 'group'=>$group->getID());
+ $headerArr = array('title' => $title, 'group' => $group->getID());
project_admin_header($headerArr);
$object = $group;
@@ -81,7 +81,7 @@ if (!$atid && !$group_id) {
}
$ath = new ArtifactTypeHtml($group,$atid);
if (!$ath || !is_object($ath)) {
- exit_error(_('ArtifactType could not be created'),'tracker');
+ exit_error(_('ArtifactType could not be created'), 'tracker');
}
if ($ath->isError()) {
exit_error($ath->getErrorMessage(),'tracker');
@@ -96,7 +96,7 @@ if (!$atid && !$group_id) {
}
$effortUnitSet = new EffortUnitSet($object, $unitSetId);
-switch (getStringFromRequest('function','')) {
+switch (getStringFromRequest('function', '')) {
case 'add':
add_unit($effortUnitSet);
break;
-----------------------------------------------------------------------
Summary of changes:
src/bin/forge | 7 +++++++
src/common/tracker/EffortUnit.class.php | 2 +-
src/common/tracker/EffortUnitFactory.class.php | 4 ++--
src/common/tracker/EffortUnitSet.class.php | 10 +++++-----
src/common/tracker/actions/effort_units.php | 8 ++++----
5 files changed, 19 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
