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, 6.1 has been updated
via a98312ac3c6f37a890870261a29493afa2b7afe3 (commit)
via 33354ccfbcb6cebbe5c487fd8e24ef9836cb5648 (commit)
via 3399f69df846b99638aec831c5f87817e3d1215b (commit)
from 640a2e5a69a2f8648818d9fc945da401c2c96a9b (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=a98312ac3c6f37a890870261a29493afa2b7afe3
commit a98312ac3c6f37a890870261a29493afa2b7afe3
Author: Franck Villaume <[email protected]>
Date: Sun Oct 8 11:23:23 2017 +0200
tabs & missing initial activation of SLA custom field
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index a0b3529..5ee443d 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -437,6 +437,8 @@ class ArtifactTypeHtml extends ArtifactType {
$str =
$this->renderEffort($efarr[$i]['extra_field_id'],
$selected[$efarr[$i]['extra_field_id']], $efarr[$i]['attribute1'],
$efarr[$i]['attribute2'], $attrs);
} elseif ($efarr[$i]['field_type'] ==
ARTIFACT_EXTRAFIELDTYPE_EFFORTRANGE) {
$str =
$this->renderEffortRange($efarr[$i]['extra_field_id'],
$selected[$efarr[$i]['extra_field_id']], $efarr[$i]['attribute1'],
$efarr[$i]['attribute2'], $attrs);
+ } elseif ($efarr[$i]['field_type'] ==
ARTIFACT_EXTRAFIELDTYPE_SLA) {
+ $str =
$this->renderSLAField($efarr[$i]['extra_field_id'],
$selected[$efarr[$i]['extra_field_id']], $attrs);
}
$template =
str_replace('{$PostName:'.$efarr[$i]['field_name'].'}', $post_name, $template);
$template =
str_replace('{$'.$efarr[$i]['field_name'].'}', $str, $template);
@@ -1307,22 +1309,22 @@ class ArtifactTypeHtml extends ArtifactType {
}
/**
- * renderFormulaField - this function builds a formula field (RO).
+ * renderFormulaField - this function builds a formula field (RO).
*
- * @param string $contents The data for this field.
- * @return string
+ * @param string $contents The data for this field.
+ * @return string
*/
function renderFormulaField($contents) {
return $contents;
}
/**
- * renderSLAField - this function builds a formula field (RO).
+ * renderSLAField - this function builds a formula field (RO).
*
- * @param int $extra_field_id The ID of this field.
- * @param string $contents The data for this field.
- * @param $ef
- * @return string
+ * @param int $extra_field_id The ID of this field.
+ * @param string $contents The data for this field.
+ * @param $ef
+ * @return string
*/
function renderSLAField($extra_field_id, $contents, $ef) {
global $aid;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=33354ccfbcb6cebbe5c487fd8e24ef9836cb5648
commit 33354ccfbcb6cebbe5c487fd8e24ef9836cb5648
Author: Franck Villaume <[email protected]>
Date: Sun Oct 8 11:22:46 2017 +0200
tabs & remove useless comments
diff --git a/src/common/tracker/ArtifactExtraField.class.php
b/src/common/tracker/ArtifactExtraField.class.php
index b1ab46e..f6d2303 100644
--- a/src/common/tracker/ArtifactExtraField.class.php
+++ b/src/common/tracker/ArtifactExtraField.class.php
@@ -36,10 +36,8 @@ define('ARTIFACT_EXTRAFIELDTYPE_STATUS',7);
//define('ARTIFACT_EXTRAFIELDTYPE_ASSIGNEE',8);
define('ARTIFACT_EXTRAFIELDTYPE_RELATION',9);
define('ARTIFACT_EXTRAFIELDTYPE_INTEGER',10);
-/* reserved for aljeux extension, for merge into FusionForge */
define('ARTIFACT_EXTRAFIELDTYPE_FORMULA',11);
define('ARTIFACT_EXTRAFIELDTYPE_DATETIME',12);
-/* 13: reserved SLA */
define('ARTIFACT_EXTRAFIELDTYPE_SLA',13);
define('ARTIFACT_EXTRAFIELDTYPE_USER',14);
define('ARTIFACT_EXTRAFIELDTYPE_MULTIUSER',15);
@@ -129,8 +127,8 @@ class ArtifactExtraField extends FFError {
* @param bool $autoassign True or false whether
it triggers auto-assignment rules
* @param bool $is_hidden_on_submit True or false to
display the extrafield in the new artifact submit page
* @param bool $is_disabled True or false to
enable/disable the extrafield
- * @param int $aggregation_rule
- * @param int $distribution_rule
+ * @param int $aggregation_rule
+ * @param int $distribution_rule
* @return bool true on success / false on failure.
*/
function create($name, $field_type, $attribute1, $attribute2,
$is_required = false, $alias = '', $show100 = true, $show100label = 'none',
$description = '', $pattern = '', $parent = 100, $autoassign = false,
$is_hidden_on_submit = false, $is_disabled = false, $aggregation_rule = 0,
$distribution_rule = 0) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3399f69df846b99638aec831c5f87817e3d1215b
commit 3399f69df846b99638aec831c5f87817e3d1215b
Author: Franck Villaume <[email protected]>
Date: Sun Oct 8 11:11:26 2017 +0200
tabs
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 8e0228f..a0b3529 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -156,14 +156,14 @@ class ArtifactTypeHtml extends ArtifactType {
/**
* renderExtraFields - ???
*
- * @param array $selected
- * @param bool $show_100
Display the specific '100' value. Default is false.
- * @param string $text_100
Label displayed for the '100' value. Default is 'none'
- * @param bool $show_any
- * @param string $text_any
- * @param array $types
- * @param bool $status_show_100 Force
display of the '100' value if needed. Default is false.
- * @param string $mode
QUERY, DISPLAY, UPDATE, NEW
+ * @param array $selected
+ * @param bool $show_100 Display the specific
'100' value. Default is false.
+ * @param string $text_100 Label displayed for the
'100' value. Default is 'none'
+ * @param bool $show_any
+ * @param string $text_any
+ * @param array $types
+ * @param bool $status_show_100 Force display of the
'100' value if needed. Default is false.
+ * @param string $mode QUERY, DISPLAY, UPDATE,
NEW
*/
function renderExtraFields($selected = array(),
$show_100 = false, $text_100 = 'none',
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/ArtifactExtraField.class.php | 6 ++--
.../tracker/include/ArtifactTypeHtml.class.php | 34 ++++++++++++----------
2 files changed, 20 insertions(+), 20 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
