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 760e1bfeb1b0675b4518c7b9c4e0b5a38ae29be5 (commit)
from 732d6a4d05e3c6d06de56a95132969b77dc2e80a (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=760e1bfeb1b0675b4518c7b9c4e0b5a38ae29be5
commit 760e1bfeb1b0675b4518c7b9c4e0b5a38ae29be5
Author: Franck Villaume <[email protected]>
Date: Wed Oct 11 21:45:10 2017 +0200
fix detail artifact display with hasRelations in the 2-columns standard
template
diff --git a/src/common/tracker/actions/detail.php
b/src/common/tracker/actions/detail.php
index 51296b0..70c7758 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -247,9 +247,11 @@ if ($group->usesPM()) {
<div id="tabber-changes" class="tabbertab">
<?php echo $ah->showHistory(); ?>
</div>
+ <?php if ($ah->hasRelations()) { ?>
<div id="tabber-relations" class="tabbertab">
<?php echo $ah->showRelations(); ?>
</div><?php
+ }
if (forge_get_config('use_artefacts_dependencies')) { ?>
<div id="tabber-dependencies" class="tabbertab">
<?php echo $ah->showDependencies()
diff --git a/src/common/tracker/actions/mod-limited.php
b/src/common/tracker/actions/mod-limited.php
index 429e057..6f34933 100644
--- a/src/common/tracker/actions/mod-limited.php
+++ b/src/common/tracker/actions/mod-limited.php
@@ -272,9 +272,11 @@ echo $ath->renderFiles($group_id, $ah);
<div id="tabber-changes" class="tabbertab">
<?php echo $ah->showHistory(); ?>
</div>
+<?php if ($ah->hasRelations()) { ?>
<div id="tabber-relations" class="tabbertab">
<?php echo $ah->showRelations(); ?>
</div><?php
+}
if (forge_get_config('use_artefacts_dependencies')) { ?>
<div id="tabber-dependencies" class="tabbertab">
<?php echo $ah->showDependencies();
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index 105ae21..ab8fd9a 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -350,9 +350,11 @@ echo $ath->renderFiles($group_id, $ah);
<div id="tabber-changes" class="tabbertab">
<?php echo $ah->showHistory(); ?>
</div>
+<?php if ($ah->hasRelations()) { ?>
<div id="tabber-relations" class="tabbertab">
<?php echo $ah->showRelations(); ?>
</div><?php
+}
if (forge_get_config('use_artefacts_dependencies')) { ?>
<div id="tabber-dependencies" class="tabbertab">
<?php echo $ah->showDependencies(); ?>
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/detail.php | 2 ++
src/common/tracker/actions/mod-limited.php | 2 ++
src/common/tracker/actions/mod.php | 2 ++
3 files changed, 6 insertions(+)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits