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 93c57d088596d4371f46bad89cc9f16cb5ba30cc (commit)
from 465519a88279d9fb82f84cd69750d952fcadd008 (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=93c57d088596d4371f46bad89cc9f16cb5ba30cc
commit 93c57d088596d4371f46bad89cc9f16cb5ba30cc
Author: Stéphane-Eymeric Bredthauer <[email protected]>
Date: Wed May 31 16:57:40 2017 +0200
Tracker: Artifacts dependencies, part 4, fix 1
diff --git a/src/common/widget/Widget_TrackerContent.class.php
b/src/common/widget/Widget_TrackerContent.class.php
index b3cf017..ff72c1d 100644
--- a/src/common/widget/Widget_TrackerContent.class.php
+++ b/src/common/widget/Widget_TrackerContent.class.php
@@ -563,7 +563,7 @@ EOS;
} else {
$allowed = $allowedWF;
}
-
$allowed[] = $selected_node;
+
$allowed[] = $value;
$cellContent .= $ath->renderSelect($keys[0], $value, false,
$extrafieldObject->getShow100label(), false, false, $allowed, $attrs);
}
break;
@@ -581,6 +581,19 @@ EOS;
$cellContent .= $ath->renderRelationField($keys[0], $value,
$extrafieldObject->getAttribute1(), $extrafieldObject->getAttribute2(), $attrs);
}
break;
+ case
ARTIFACT_EXTRAFIELDTYPE_PARENT:
+ if
($readonly) {
+
$value = preg_replace_callback('/\b(\d+)\b/', create_function('$matches',
'return _artifactid2url($matches[1], \'title\');'), $value);
+
$cellContent .= $value;
+ } else {
+
// specific rewrite of cellContent
+
$cellContent = '<div style="width:100%; line-height: 20px;">' .
+
'<div style="float:left;">'.html_e('strong', array(),
$extrafieldObject->getName()._(':')).$mandatory.'</div>' .
+
'<div>' . $HTML->getEditFilePic(_('Click to edit'), _('Click to
edit'), array('class' => 'mini_buttons tip-ne', 'onclick'=>"switch2edit(this,
'show$keys[0]', 'edit$keys[0]')")).'</div>'.
+
'</div>';
+
$cellContent .= $ath->renderParentField($keys[0], $value,
$extrafieldObject->getAttribute1(), $extrafieldObject->getAttribute2(), $attrs);
+ }
+ break;
case
ARTIFACT_EXTRAFIELDTYPE_INTEGER:
if
($readonly) {
$cellContent .= $value;
-----------------------------------------------------------------------
Summary of changes:
src/common/widget/Widget_TrackerContent.class.php | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
