From: Guy Pyrzak <guy.pyrzak@gmail.com>
Date: Thu, 28 Oct 2010 00:35:16 +0000 (+0200)
Subject: Bug 607716: The attachment content is pasted into a comment when editing an attachmen... 
X-Git-Tag: bugzilla-4.1.1~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=178eb04938393f06f60ee1a21df5d2a955c93634;p=thirdparty%2Fbugzilla.git

Bug 607716: The attachment content is pasted into a comment when editing an attachment with JS disabled
r=LpSolit r=mkanat a=LpSolit
---

diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 676f374e61..f124df43f8 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -180,6 +180,7 @@
               minrows = 10
               cols    = 80
               wrap    = 'soft'
+              disabled = 'disabled'
               defaultcontent = (attachment.contenttype.match('^text\/')) ?
                                  attachment.data.replace('(.*\n|.+)', '>$1') : undef
             %]
@@ -217,6 +218,10 @@
                   document.write('<button type="button" id="editButton" onclick="editAsComment(patchviewerinstalled);">Edit Attachment As Comment<\/button>');
                   document.write('<button type="button" id="undoEditButton" onclick="undoEditAsComment(patchviewerinstalled);" class="bz_default_hidden">Undo Edit As Comment<\/button>');
                   document.write('<button type="button" id="redoEditButton" onclick="redoEditAsComment(patchviewerinstalled);" class="bz_default_hidden">Redo Edit As Comment<\/button>');
+                  var editFrame = document.getElementById('editFrame');
+                  if (editFrame) {
+                    editFrame.disabled = false;
+                  }
                 [% END %]
                 [% IF use_patchviewer %]
                   document.write('<button type="button" id="viewDiffButton" onclick="viewDiff(attachment_id, patchviewerinstalled);">View Attachment As Diff<\/button>');
diff --git a/template/en/default/global/textarea.html.tmpl b/template/en/default/global/textarea.html.tmpl
index 65dd93bdc4..c158615bd7 100644
--- a/template/en/default/global/textarea.html.tmpl
+++ b/template/en/default/global/textarea.html.tmpl
@@ -41,6 +41,7 @@
           [% IF style %] style="[% style FILTER html %]"[% END %]
           [% IF classes %] class="[% classes FILTER html %]"[% END %]
           [% IF wrap %] wrap="[% wrap FILTER html %]"[% END %]
+          [% IF disabled %] disabled="disabled"[% END %]
           [% IF defaultrows && user.settings.zoom_textareas.value == 'off' %]
             rows="[% defaultrows FILTER html %]"
           [% ELSE %]