[Fusionforge-commits] FusionForge branch master updated. 9cb2fb1 Merge branch '6.0'

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Jun 7 18:48:41 CEST 2015


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  9cb2fb1b401deec39d3db5679017b2d862fadb3a (commit)
       via  c5dbca38e2687cf3d04779a9b3fcab325f25b04e (commit)
      from  17c719aba8cbe64da895797f77f9296d267426f1 (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 -----------------------------------------------------------------
commit 9cb2fb1b401deec39d3db5679017b2d862fadb3a
Merge: 17c719a c5dbca3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 7 18:48:33 2015 +0200

    Merge branch '6.0'


-----------------------------------------------------------------------

Summary of changes:
 src/common/tracker/Artifact.class.php             | 23 ++++++++++++++++++++++-
 src/common/tracker/actions/detail.php             |  3 +++
 src/common/tracker/actions/mod-limited.php        |  3 +++
 src/common/tracker/actions/mod.php                |  3 +++
 src/common/tracker/include/ArtifactHtml.class.php |  4 ++--
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/common/tracker/Artifact.class.php b/src/common/tracker/Artifact.class.php
index e9a86ae..363b307 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -7,7 +7,7 @@
  * Copyright 2009, Roland Mas
  * Copyright (C) 2009-2013 Alain Peyrat, Alcatel-Lucent
  * Copyright 2012, Thorsten “mirabilos” Glaser <t.glaser at tarent.de>
- * Copyright 2014, Franck Villaume - TrivialDev
+ * Copyright 2014-2015, Franck Villaume - TrivialDev
  *
  * This file is part of FusionForge. FusionForge is free software;
  * you can redistribute it and/or modify it under the terms of the
@@ -1859,6 +1859,27 @@ class Artifact extends Error {
 		}
 		return $this->votes;
 	}
+
+	function hasRelations() {
+		$aid = $this->getID();
+		$res = db_query_params('SELECT *
+					FROM artifact_extra_field_list, artifact_extra_field_data, artifact_group_list, artifact, groups
+					WHERE field_type=9
+					AND artifact_extra_field_list.extra_field_id=artifact_extra_field_data.extra_field_id
+					AND artifact_group_list.group_artifact_id = artifact_extra_field_list.group_artifact_id
+					AND artifact.artifact_id = artifact_extra_field_data.artifact_id
+					AND groups.group_id = artifact_group_list.group_id
+					AND (field_data = $1 OR field_data LIKE $2 OR field_data LIKE $3 OR field_data LIKE $4)
+					ORDER BY artifact_group_list.group_id ASC, name ASC, artifact.artifact_id ASC',
+					array($aid,
+					      "$aid %",
+					      "% $aid %",
+					      "% $aid"));
+		if (db_numrows($res)>0) {
+			return true;
+		}
+		return false;
+	}
 }
 
 class ArtifactComparator {
diff --git a/src/common/tracker/actions/detail.php b/src/common/tracker/actions/detail.php
index 53fb9e2..ec7510f 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -157,6 +157,9 @@ foreach ($pluginsListeners as $pluginsListener) {
 	<li><a href="#tabber-commits"><?php echo _('Commits'); ?></a></li>
 	<?php } ?>
 	<li><a href="#tabber-changes"><?php echo _('Changes'); ?></a></li>
+	<?php if ($ah->hasRelations()) { ?>
+	<li><a href="#tabber-relations"><?php echo _('Relations'); ?></a></li>
+	<?php } ?>
 	</ul>
 	<div id="tabber-comments" class="tabbertab" title="<?php echo _('Comments').$nb; ?>">
 		<table width="80%">
diff --git a/src/common/tracker/actions/mod-limited.php b/src/common/tracker/actions/mod-limited.php
index 63fb600..200d587 100644
--- a/src/common/tracker/actions/mod-limited.php
+++ b/src/common/tracker/actions/mod-limited.php
@@ -189,6 +189,9 @@ foreach ($pluginsListeners as $pluginsListener) {
 	<li><a href="#tabber-commits"><?php echo _('Commits'); ?></a></li>
 	<?php } ?>
 	<li><a href="#tabber-changes"><?php echo _('Changes'); ?></a></li>
+	<?php if ($ah->hasRelations()) { ?>
+	<li><a href="#tabber-relations"><?php echo _('Relations'); ?></a></li>
+	<?php } ?>
 	</ul>
 	<div id="tabber-comments" class="tabbertab" title="<?php echo _('Comments').$nb; ?>">
 	<table width="80%">
diff --git a/src/common/tracker/actions/mod.php b/src/common/tracker/actions/mod.php
index 4e0b137..b367e3d 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -227,6 +227,9 @@ foreach ($pluginsListeners as $pluginsListener) {
 	<li><a href="#tabber-commits"><?php echo _('Commits'); ?></a></li>
 	<?php } ?>
 	<li><a href="#tabber-changes"><?php echo _('Changes'); ?></a></li>
+	<?php if ($ah->hasRelations()) { ?>
+	<li><a href="#tabber-relations"><?php echo _('Relations'); ?></a></li>
+	<?php } ?>
 	</ul>
 <div id="tabber-comments" class="tabbertab" title="<?php echo _('Comments').$nb; ?>">
 <table width="80%">
diff --git a/src/common/tracker/include/ArtifactHtml.class.php b/src/common/tracker/include/ArtifactHtml.class.php
index d40f359..ef6f114 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -207,11 +207,11 @@ function hide_edit_button(id) {
 					      "% $aid"));
 		if (db_numrows($res)>0) {
 			?>
-<div class="tabbertab" title="<?php echo _('Backward Relations'); ?>">
+<div id="tabber-relations" class="tabbertab" title="<?php echo _('Backward Relations'); ?>">
 <table class="fullwidth">
 	<tr>
 		<td colspan="2">
-		<h2><?php echo _('Changes')._(':'); ?></h2>
+		<h2><?php echo _('Relations')._(':'); ?></h2>
 		<?php
 		$current = '';
 		$end = '';


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list