summaryrefslogtreecommitdiffstats
path: root/extensions/BugModal
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-04-28 06:44:41 +0200
committerByron Jones <glob@mozilla.com>2015-04-28 06:44:41 +0200
commit92059de568ef17628928a6cf19d6fca3ee505f2b (patch)
tree00fb913f802252a4a6bb98f69d28c353b1f5ca02 /extensions/BugModal
parent29e3eb8b03ba072fa4ce092b45fb98c2e2352744 (diff)
downloadbugzilla-92059de568ef17628928a6cf19d6fca3ee505f2b.tar.gz
bugzilla-92059de568ef17628928a6cf19d6fca3ee505f2b.tar.xz
Bug 1149659: crash signature not linking to signature summary on socorro
Diffstat (limited to 'extensions/BugModal')
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl1
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/field.html.tmpl6
2 files changed, 6 insertions, 1 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index 54ae9bec0..6649399e1 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -857,6 +857,7 @@
[%
FOREACH field IN custom_fields;
NEXT IF field.type != constants.FIELD_TYPE_TEXTAREA;
+ Hook.process('custom_field-' _ field.name);
NEXT IF rendered_custom_fields.exists(field.name);
INCLUDE bug_modal/field.html.tmpl
field = field
diff --git a/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl
index d89c22868..089543c39 100644
--- a/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl
@@ -220,7 +220,11 @@ END;
[%# text area %]
<button type="button" class="minor edit-textarea-btn [%= "edit-textarea-set-btn" IF value != "" %]"
id="[% name FILTER html %]-edit">Edit</button>
- <span class="multiline-value" id="[% name FILTER html %]-view">[% value FILTER html FILTER html_line_break %]</span>
+ [% IF content.defined && !append_content %]
+ <span id="[% name FILTER html %]-view">[% content FILTER none %]</span>
+ [% ELSE %]
+ <span class="multiline-value" id="[% name FILTER html %]-view">[% value FILTER html FILTER html_line_break %]</span>
+ [% END %]
<textarea id="[% name FILTER html %]" name="[% name FILTER html %]"
rows="10" cols="10" style="display:none">[% value FILTER html %]</textarea>