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 4b2994cd5b63dafb49810b8b37468f69b93450b7 (commit)
from e5cf506d83d1106fbdb3a67278bb0dc83004a225 (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=4b2994cd5b63dafb49810b8b37468f69b93450b7
commit 4b2994cd5b63dafb49810b8b37468f69b93450b7
Author: Franck Villaume <[email protected]>
Date: Sun Sep 4 18:59:22 2016 +0200
tracker artifact: fix display relation, check correct permission
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index d407169..fc32c21 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -4,7 +4,8 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright (C) 2011-2012 Alain Peyrat - Alcatel-Lucent
- * Copyright 2011,2015 Franck Villaume - Capgemini
+ * Copyright 2011, Franck Villaume - Capgemini
+ * Copyright 2015, 2016, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -212,24 +213,26 @@ function hide_edit_button(id) {
<table class="fullwidth">
<tr>
<td colspan="2">
- <h2><?php echo _('Relations')._(':'); ?></h2>
<?php
$current = '';
$end = '';
while ($arr = db_fetch_array($res)) {
- $title = $arr['group_name']._(': ').$arr['name'];
- if ($title != $current) {
- echo $end.'<strong>'.$title.'</strong>';
- $current = $title;
- $end = '<br /><br />';
- }
- $text = '[#'.$arr['artifact_id'].']';
- $url =
'/tracker/?func=detail&aid='.$arr['artifact_id'].'&group_id='.$arr['group_id'].'&atid='.$arr['group_artifact_id'];
- $arg = 'title="'.util_html_secure($arr['summary']).'"' ;
- if ($arr['status_id'] == 2) {
- $arg .= 'class="artifact_closed"';
+ if (forge_check_perm('tracker',
$arr['group_artifact_id'], 'read')) {
+ $title = $arr['group_name']._(':
').$arr['name'];
+ if ($title != $current) {
+ echo $end.'<strong>'.$title.'</strong>';
+ $current = $title;
+ $end = '<br /><br />';
+ }
+ $text = '[#'.$arr['artifact_id'].']'.'
'.$arr['summary'];
+ $url =
'/tracker/?func=detail&aid='.$arr['artifact_id'].'&group_id='.$arr['group_id'].'&atid='.$arr['group_artifact_id'];
+ $arg['title'] =
util_html_secure($arr['summary']);
+ if ($arr['status_id'] == 2) {
+ $arg['class'] = 'artifact_closed';
+ }
+ print '<br/> ';
+ echo util_make_link($url, $text, $arg).'
<i>('._('Relation')._(': ').$arr['field_name'].')</i>';
}
- print '<br/> <a href="'.$url.'"
'.$arg.'>'.$text.'</a>'.' <a href="'.$url.'">'.$arr['summary'].'</a>
<i>(Relation: '.$arr['field_name'].')</i>';
}
?></td>
</tr>
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/include/ArtifactHtml.class.php | 31 +++++++++++++----------
1 file changed, 17 insertions(+), 14 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
