add field description

diff --git a/app/controllers/quick_edit_issues_controller.rb b/app/controllers/quick_edit_issues_controller.rb
index 226aa17..0271bcf 100644 (file)
--- a/app/controllers/quick_edit_issues_controller.rb
+++ b/app/controllers/quick_edit_issues_controller.rb
@@ -10,12 +10,14 @@ class QuickEditIssuesController < ApplicationController
       custom_field_name = 'issue[custom_field_values][%d]' % f.id
       if custom_field_name == @target_specifier
         @dialog_params = get_input_dialog_params_for_custom_fields(@issue, @target_specifier, f)
+        @dialog_params[:description] = f.description.presence
       end
     end
     if @dialog_params.nil?
       @dialog_params = get_input_dialog_params_for_core_fields(@issue, @target_specifier)
+      @dialog_params[:description] = nil
     end
-
+    @dialog_params[:description] = nil if (@dialog_params[:description] == "")
     @dialog_params[:issue_ids] = params[:ids]
     @dialog_params[:back_url] = params[:back_url]
     @dialog_params[:default_value] = params[:default_value] unless (params[:default_value].nil?)

diff --git a/app/views/quick_edit_issues/_input_dialog.html.erb b/app/views/quick_edit_issues/_input_dialog.html.erb
index 19ce68b..15cf6c1 100644 (file)
--- a/app/views/quick_edit_issues/_input_dialog.html.erb
+++ b/app/views/quick_edit_issues/_input_dialog.html.erb
@@ -36,9 +36,12 @@
     <input id="new_value"
            name="<%= @dialog_params[:target_specifier] %>"
            type="text"
-           size="70"
+           size="80"
            value="<%= @dialog_params[:default_value] %>"></input>
     <% end %>
+    <% if !@dialog_params[:description].nil? %>
+    <pre style="border: 1px solid #e0e0e0; padding: 3px; overflow:auto; height: 2.8em; margin-top: 10px; margin-bottom: 0px;"><%= @dialog_params[:description] %></pre>
+    <% end %>
     <% @dialog_params[:issue_ids].each do |id| %>
     <input id="ids" name="ids[]" type="hidden" value="<%= id %>"></input>
     <% end %>
@@ -55,7 +58,7 @@
 //<![CDATA[
   $(".ui-autocomplete").css("z-index",200);
   var width = <%= (@dialog_params[:field_type] == :int || @dialog_params[:field_type] == :date) ? 480 : 707 %>;
-  var height = <%= (@dialog_params[:field_type] == :text) ? 450 : 275 %>;
+  var height = <%= ((@dialog_params[:field_type] == :text) ? 445 : 280) + ((@dialog_params[:description].nil?) ? 0 : 50) %>;
   $("#quick_edit_input_dialog").dialog({
      modal: true,
      closeOnEscape: false,