summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2012-09-25 16:22:56 +0200
committerByron Jones <bjones@mozilla.com>2012-09-25 16:22:56 +0200
commitfa8ddc3179ace6ff18c0df8bb0e2d11ffb1b6ca2 (patch)
treedd338486b24b648c117b78085d2f9562de43c30b
parentac21d130577c44f6887ae8520abac5a60aeba1b0 (diff)
downloadbugzilla-fa8ddc3179ace6ff18c0df8bb0e2d11ffb1b6ca2.tar.gz
bugzilla-fa8ddc3179ace6ff18c0df8bb0e2d11ffb1b6ca2.tar.xz
Bug 783091: Missing links when there are multiple "review?(foo)" shown in attachment box on show_bug.cgi
-rw-r--r--extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl3
-rw-r--r--extensions/InlineHistory/web/inline-history.js3
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
index b8a01aa75..1c47fd21c 100644
--- a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
+++ b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
@@ -18,14 +18,13 @@
var html = '';
[% has_cc = 0 %]
[% has_flag = 0 %]
- [% changer_identity = "" %]
+ [% changer_identity = operation.who.identity %]
[% changer_login = operation.who.login %]
[% change_date = operation.when FILTER time %]
[% FOREACH change = operation.changes %]
[%# track flag changes %]
[% IF change.fieldname == 'flagtypes.name' && change.added != '' %]
- [% changer_identity = operation.who.identity UNLESS changer_identity %]
var item = new Array(5);
item[0] = '[% changer_login FILTER js %]';
item[1] = '[% change_date FILTER js %]';
diff --git a/extensions/InlineHistory/web/inline-history.js b/extensions/InlineHistory/web/inline-history.js
index e07872c9e..973ae09ec 100644
--- a/extensions/InlineHistory/web/inline-history.js
+++ b/extensions/InlineHistory/web/inline-history.js
@@ -264,7 +264,7 @@ var inline_history = {
) {
html +=
setterSpan + ': '
- + '<a href="#' + flagItem[5] + '">' + flag + '</a>'
+ + '<a href="#' + flagItem[5] + '">' + flag + '</a> '
+ requestee + '<br>';
found = true;
break;
@@ -373,6 +373,7 @@ var inline_history = {
},
htmlDecode: function(v) {
+ if (!v.match(/&/)) return v;
var e = document.createElement('textarea');
e.innerHTML = v;
return e.value;