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 f5d1266f5caa060ca961ef73af1b639a9b5eb453 (commit)
via 844653417cf6663d4bae6cacf048887c441cce08 (commit)
via 6789b05fe68f2fe5deb9f30f26813e4c5ff744bf (commit)
from cc41a7fd0a68aa854da1a42ebb38c8a6a3285459 (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=f5d1266f5caa060ca961ef73af1b639a9b5eb453
commit f5d1266f5caa060ca961ef73af1b639a9b5eb453
Author: Franck Villaume <[email protected]>
Date: Sun Apr 22 12:44:36 2018 +0200
artifact detail page: more consistant
diff --git a/src/common/tracker/actions/detail.php
b/src/common/tracker/actions/detail.php
index e10086e..47301d6 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -5,7 +5,7 @@
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
* Copyright 2012, Thorsten “mirabilos” Glaser <[email protected]>
- * Copyright 2012-2016, Franck Villaume - TrivialDev
+ * Copyright 2012-2016,2018, Franck Villaume - TrivialDev
* http://fusionforge.org/
*
* This file is part of FusionForge. FusionForge is free software;
@@ -33,7 +33,7 @@ global $HTML;
html_use_jqueryui();
html_use_coolfieldset();
-$ath->header(array ('title'=> $ah->getStringID().' '. $ah->getSummary(),
'atid'=>$ath->getID()));
+$ath->header(array('title'=> $ah->getStringID().' '. $ah->getSummary(),
'atid'=>$ath->getID()));
echo notepad_func();
@@ -181,8 +181,8 @@ $nbh = $count? ' ('.$count.')' : '';
</ul>
<div id="tabber-comments" class="tabbertab">
<?php echo $HTML->listTableTop();
- if (forge_check_perm
('tracker',$ath->getID(),'submit')) { ?>
- <tr><td colspan="2">
+ if (session_loggedin() && ($ah->getSubmittedBy() ==
user_getid())) { ?>
+ <tr><td>
<input type="hidden" name="form_key"
value="<?php echo form_generate_key(); ?>" />
<input type="hidden" name="func"
value="postmod" />
<input type="hidden" name="MAX_FILE_SIZE"
value="10000000" />
@@ -194,7 +194,7 @@ $nbh = $count? ' ('.$count.')' : '';
</p>
</td></tr>
<?php } ?>
- <tr><td colspan="2">
+ <tr><td>
<?php echo $ah->showMessages(); ?>
</td></tr>
<?php echo $HTML->listTableBottom(); ?>
@@ -210,18 +210,18 @@ if ($group->usesPM()) {
<?php }
?>
<div id="tabber-attachments" class="tabbertab">
- <?php echo $HTML->listTableTop(); ?>
- <tr><td colspan="2">
- <?php if (session_loggedin() && ($ah->getSubmittedBy() ==
user_getid())) { ?>
+ <?php if (session_loggedin() && ($ah->getSubmittedBy() ==
user_getid())) {
+ echo $HTML->listTableTop(); ?>
+ <tr><td>
<strong><?php echo _('Attach Files')._(':');
?></strong> <?php echo('('._('max upload size')._(':
').human_readable_bytes(util_get_maxuploadfilesize()).')') ?><br />
<input type="file" name="input_file0" /><br />
<input type="file" name="input_file1" /><br />
<input type="file" name="input_file2" /><br />
<input type="file" name="input_file3" /><br />
<input type="file" name="input_file4" /><br />
- <?php } ?>
</td></tr>
<?php echo $HTML->listTableBottom();
+ }
//
// print a list of files attached to this Artifact
//
@@ -260,16 +260,11 @@ if ($group->usesPM()) {
}
if (forge_get_config('use_object_associations')) { ?>
<div id="tabber-object-associations" class="tabbertab">
- <?php if (forge_check_perm ('tracker',$ath->getID(),'submit')) {
- echo
$ah->showAssociations('/tracker/?rtype=ajax&aid='.$ah->getID().'&group_id='.$ath->Group->getID().'&atid='.$ath->getID().'&func=removeassoc');
- echo $ah->showAddAssociations();
- } else {
- echo $ah->showAssociations();
- } ?>
+ <?php echo $ah->showAssociations(); ?>
</div>
<?php } ?>
</div>
-<?php if (session_loggedin()) {
+<?php if (session_loggedin() && ($ah->getSubmittedBy() == user_getid())) {
echo $HTML->listTableTop(); ?>
<tr>
<td>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=844653417cf6663d4bae6cacf048887c441cce08
commit 844653417cf6663d4bae6cacf048887c441cce08
Author: Franck Villaume <[email protected]>
Date: Sun Apr 22 12:44:17 2018 +0200
less code
diff --git a/src/common/widget/Widget_TrackerComment.class.php
b/src/common/widget/Widget_TrackerComment.class.php
index bd59fad..3133612 100644
--- a/src/common/widget/Widget_TrackerComment.class.php
+++ b/src/common/widget/Widget_TrackerComment.class.php
@@ -74,6 +74,7 @@ class Widget_TrackerComment extends Widget {
}
$elementsLi[] = array('content' =>
util_make_link('#tabber-attachments', _('Attachments').$nbf, false, true));
$pluginfound = false;
+ $tabberContent = '';
if ($func == 'detail') {
$pm = plugin_manager_get_object();
$pluginsListeners =
$pm->GetHookListeners('artifact_extra_detail');
@@ -109,9 +110,6 @@ class Widget_TrackerComment extends Widget {
}
$elementsLi[] = array('content' =>
util_make_link('#tabber-associations', $tabTitle, false, true));
}
- }
- $tabberContent = '';
- if ($func == 'detail') {
$divContent = '';
if (forge_check_perm('tracker', $atid, 'tech')) {
$divContent .= html_e('strong', array(), _('Use
Canned Response')._(':')).html_e('br').
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6789b05fe68f2fe5deb9f30f26813e4c5ff744bf
commit 6789b05fe68f2fe5deb9f30f26813e4c5ff744bf
Author: Franck Villaume <[email protected]>
Date: Sun Apr 22 12:44:01 2018 +0200
lower case + missing information when no dependency found
diff --git a/src/common/tracker/include/ArtifactHtml.class.php
b/src/common/tracker/include/ArtifactHtml.class.php
index 10f8949..9e1b216 100644
--- a/src/common/tracker/include/ArtifactHtml.class.php
+++ b/src/common/tracker/include/ArtifactHtml.class.php
@@ -144,7 +144,7 @@ function hide_edit_button(id) {
$return .= $HTML->listTableBottom();
} else {
- $return .= $HTML->information(_('No Comments Have Been
Posted'));
+ $return .= $HTML->information(_('No comments have been
posted'));
}
return $return;
}
@@ -205,7 +205,7 @@ function hide_edit_button(id) {
$return .= $HTML->listTableBottom();
} else {
- $return .= $HTML->information(_('No Changes Have Been
Made to This Item'));
+ $return .= $HTML->information(_('No changes have been
made to this item'));
}
return $return;
}
@@ -370,6 +370,8 @@ function hide_edit_button(id) {
$return .= html_ac(html_ap()-1);
}
$return .= html_ac(html_ap()-1);
+ } else {
+ $return .= $HTML->information(_('No dependency'));
}
return $return;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/detail.php | 27 +++++++++--------------
src/common/tracker/include/ArtifactHtml.class.php | 6 +++--
src/common/widget/Widget_TrackerComment.class.php | 4 +---
3 files changed, 16 insertions(+), 21 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
