allow add private notes. refs #35392

diff --git a/app/controllers/quick_edit_issues_controller.rb b/app/controllers/quick_edit_issues_controller.rb
index 197d752..8e2de37 100644 (file)
--- a/app/controllers/quick_edit_issues_controller.rb
+++ b/app/controllers/quick_edit_issues_controller.rb
@@ -37,8 +37,9 @@ class QuickEditIssuesController < ApplicationController
 
     Issue.transaction do
       @issues.each do |issue|
-        issue.init_journal(User.current)
+        issue.init_journal(User.current, params[:notes])
         issue.safe_attributes = {@attribute_name => issue[@attribute_name].gsub(@find_regexp, @replace)}
+        issue.safe_attributes = {'private_notes' => (params.has_key?(:private_notes) ? '1' : '0')}
 
         if emulate_bulk_update == 'on'
           emulate_params = { 'issue[subject]'.to_sym => issue.subject,

diff --git a/app/views/quick_edit_issues/_input_dialog.html.erb b/app/views/quick_edit_issues/_input_dialog.html.erb
index 2d8c479..5fec7f3 100644 (file)
--- a/app/views/quick_edit_issues/_input_dialog.html.erb
+++ b/app/views/quick_edit_issues/_input_dialog.html.erb
@@ -80,11 +80,11 @@
                     rows="5"
                     style="vertical-align:middle"></textarea>
           <%= wikitoolbar_for :notes_for_edit %>
-          <input id="issue_private_notes"
+          <input id="issue_private_notes_for_edit"
                  name="issue[private_notes]"
                  type="checkbox"
                  value="1"/>
-          <label for="issue_private_notes">Private notes</label>
+          <label for="issue_private_notes_for_edit">Private notes</label>
         </fieldset>
         <% @dialog_params[:issue_ids].each do |id| %>
         <input id="ids" name="ids[]" type="hidden" value="<%= id %>"></input>
@@ -122,6 +122,21 @@
         </div>
         <span><%= l(:label_preview) %>:</span>
         <div id="preview_area" class="ui-corner-all box">&nbsp;</div>
+
+        <fieldset style="margin-top: 10px;">
+          <legend><%= l(:field_notes) %></legend>
+          <textarea id="notes_for_replace"
+                    name="notes"
+                    class="full_width"
+                    rows="5"
+                    style="vertical-align:middle"></textarea>
+          <%= wikitoolbar_for :notes_for_replace %>
+          <input id="issue_private_notes_for_replace"
+                 name="private_notes"
+                 type="checkbox"
+                 value="1"/>
+          <label for="issue_private_notes_for_replace">Private notes</label>
+        </fieldset>
       </div>
       <input id="target_specifier" name="target_specifier" type="hidden" value="<%= @dialog_params[:target_specifier] %>"></input>
       <input id="back_url" name="back_url" type="hidden" value="<%= @dialog_params[:back_url] %>"></input>