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 878d835b1b1bb2163ce8412bdca6d735c484f31a (commit)
from cbc5c8ff3cc821b654f0719f16d1847280b8fe53 (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=878d835b1b1bb2163ce8412bdca6d735c484f31a
commit 878d835b1b1bb2163ce8412bdca6d735c484f31a
Author: Franck Villaume <[email protected]>
Date: Mon Dec 26 00:09:37 2016 +0100
fix canned_response feature
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index f25cd0e..d521910 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -241,7 +241,7 @@ foreach ($pluginsListeners as $pluginsListener) {
<tr><td colspan="2">
<br /><strong><?php echo _('Use Canned Response')._(':');
?></strong><br />
<?php
- echo $ath->cannedResponseBox('canned_response');
+ echo $ath->cannedResponseBox('tracker-canned_response');
echo " ";
echo
util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&add_canned=1',
'('._('Admin').')');
?>
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index 65a6a9a..28d4d67 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -1199,6 +1199,9 @@ class ArtifactTypeHtml extends ArtifactType {
}
function cannedResponseBox($name = 'canned_response', $checked =
'xzxz', $attrs = array()) {
+ if (!isset($attrs['id'])) {
+ $attrs['id'] = $name;
+ }
return html_build_select_box($this->getCannedResponses(),
$name, $checked, true, 'none', false, '', false, $attrs);
}
diff --git a/src/common/widget/Widget_TrackerComment.class.php
b/src/common/widget/Widget_TrackerComment.class.php
index 2ed04a9..9378020 100644
--- a/src/common/widget/Widget_TrackerComment.class.php
+++ b/src/common/widget/Widget_TrackerComment.class.php
@@ -102,7 +102,7 @@ class Widget_TrackerComment extends Widget {
$divContent = '';
if (forge_check_perm('tracker', $atid, 'tech')) {
$divContent .= html_e('strong', array(), _('Use
Canned Response')._(':')).html_e('br').
-
$ath->cannedResponseBox('canned_response', 'xzxz', array('form' =>
'trackerform')).'
'.util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&add_canned=1',
'('._('Admin').')').html_e('br').
+
$ath->cannedResponseBox('tracker-canned_response', 'xzxz', array('form' =>
'trackerform')).'
'.util_make_link('/tracker/admin/?group_id='.$group_id.'&atid='.$ath->getID().'&add_canned=1',
'('._('Admin').')').html_e('br').
'<script
type="text/javascript">//<![CDATA[
jQuery("#tracker-canned_response").change(function() {
jQuery.ajax({
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/mod.php | 2 +-
src/common/tracker/include/ArtifactTypeHtml.class.php | 3 +++
src/common/widget/Widget_TrackerComment.class.php | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
