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 5d321eb734b8354572d94433ff5fc7d8d4558d0d (commit)
from 633f5cf3d7e065bff8389a809520ade990bd1d87 (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=5d321eb734b8354572d94433ff5fc7d8d4558d0d
commit 5d321eb734b8354572d94433ff5fc7d8d4558d0d
Author: Marc-Etienne Vargenau <[email protected]>
Date: Thu Feb 9 16:51:43 2017 +0100
Whitespace
diff --git a/src/common/tracker/EffortUnit.class.php
b/src/common/tracker/EffortUnit.class.php
index 637852d..59106cb 100644
--- a/src/common/tracker/EffortUnit.class.php
+++ b/src/common/tracker/EffortUnit.class.php
@@ -119,7 +119,7 @@ class EffortUnit extends FFError {
$this->setError(sprintf(_('Unit name %s already
exist'),$name));
return false;
}
-
+
db_begin();
if(array_key_exists('user', $importData)){
$user = $importData['user'];
@@ -134,9 +134,8 @@ class EffortUnit extends FFError {
if ($is_base_unit) {
$to_unit = 1;
}
-
+
if (!$unit_position) {
-
$res = db_query_params('SELECT MAX(unit_position) AS
max_position FROM effort_unit WHERE unit_set_id = $1',
array($this->EffortUnitSet->GetID()));
if (db_numrows($res) > 0) {
$unit_position = db_result($res, 0,
'max_position') + 1;
diff --git a/src/common/tracker/actions/downloadcsv.php
b/src/common/tracker/actions/downloadcsv.php
index 6489646..d553b34 100644
--- a/src/common/tracker/actions/downloadcsv.php
+++ b/src/common/tracker/actions/downloadcsv.php
@@ -126,8 +126,8 @@ for ($i=0; $i<count($at_arr); $i++) {
//
// Show the extra fields
//
- $efd = $at_arr[$i]->getExtraFieldDataText();
- foreach ( $efd as $key => $efd_pair ) {
+ $efd = $at_arr[$i]->getExtraFieldDataText();
+ foreach ( $efd as $key => $efd_pair ) {
if ($efd_pair['type'] == ARTIFACT_EXTRAFIELDTYPE_EFFORT) {
if (!isset($effortUnitSet)) {
$effortUnitSet = new EffortUnitSet($ath,
$ath->getEffortUnitSet());
@@ -146,9 +146,9 @@ for ($i=0; $i<count($at_arr); $i++) {
} else {
$value = $efd_pair["value"];
}
- echo $sep.'"'. fix4csv($value) .'"';
- }
- echo "\n";
+ echo $sep.'"'. fix4csv($value) .'"';
+ }
+ echo "\n";
}
function fix4csv ($value) {
diff --git a/src/common/tracker/actions/query.php
b/src/common/tracker/actions/query.php
index 4444ebf..ed86cd7 100644
--- a/src/common/tracker/actions/query.php
+++ b/src/common/tracker/actions/query.php
@@ -361,14 +361,14 @@ if (forge_check_perm ('tracker', $ath->getID(),
'manager')) {
// Compute the list of fields which can be sorted.
// Currently, only scalar artifacts are taken.
$efarr = $ath->getExtraFields(array(ARTIFACT_EXTRAFIELDTYPE_TEXT,
-
ARTIFACT_EXTRAFIELDTYPE_TEXTAREA,
- ARTIFACT_EXTRAFIELDTYPE_INTEGER,
- ARTIFACT_EXTRAFIELDTYPE_SELECT,
- ARTIFACT_EXTRAFIELDTYPE_RADIO,
- ARTIFACT_EXTRAFIELDTYPE_STATUS,
- ARTIFACT_EXTRAFIELDTYPE_DATE,
-
ARTIFACT_EXTRAFIELDTYPE_DATETIME,
-
ARTIFACT_EXTRAFIELDTYPE_EFFORT));
+ ARTIFACT_EXTRAFIELDTYPE_TEXTAREA,
+ ARTIFACT_EXTRAFIELDTYPE_INTEGER,
+ ARTIFACT_EXTRAFIELDTYPE_SELECT,
+ ARTIFACT_EXTRAFIELDTYPE_RADIO,
+ ARTIFACT_EXTRAFIELDTYPE_STATUS,
+ ARTIFACT_EXTRAFIELDTYPE_DATE,
+ ARTIFACT_EXTRAFIELDTYPE_DATETIME,
+ ARTIFACT_EXTRAFIELDTYPE_EFFORT));
$keys=array_keys($efarr);
for ($k=0; $k<count($keys); $k++) {
$i=$keys[$k];
diff --git a/src/common/tracker/views/form-clonetracker.php
b/src/common/tracker/views/form-clonetracker.php
index a2344d6..c59cc9c 100644
--- a/src/common/tracker/views/form-clonetracker.php
+++ b/src/common/tracker/views/form-clonetracker.php
@@ -47,7 +47,7 @@ foreach ($arr_g as $g) {
}
}
-$ath->adminHeader(array ('title'=>_('Clone Tracker'), 'modal'=>1));
+$ath->adminHeader(array('title'=>_('Clone Tracker'), 'modal'=>1));
if (count($ids) < 1) {
echo $HTML->warning_msg(_('The site administrator must first set up
template trackers in the template project with default values and set
permissions properly so you can access them.'));
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/EffortUnit.class.php | 5 ++---
src/common/tracker/actions/downloadcsv.php | 10 +++++-----
src/common/tracker/actions/query.php | 16 ++++++++--------
src/common/tracker/views/form-clonetracker.php | 2 +-
4 files changed, 16 insertions(+), 17 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
