jro_apps/redmine Commit - r11962:e35640f3e82c

Allows user to clear dates and text fields when bulk editing issues (#2199)....

Jean-Philippe Lang -

r11962:e35640f3e82c

parent child

Context file:

r11962:e35640f3e82c

Collapse all files

The requested changes are too big and content was truncated. Show full diff

app/helpers/custom_fields_helper.rb +15 -3

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module CustomFieldsHelper
               CUSTOM_FIELDS_TABS = [
                 {:name => 'IssueCustomField', :partial => 'custom_fields/index',
                  :label => :label_issue_plural},
                 {:name => 'TimeEntryCustomField', :partial => 'custom_fields/index',
                  :label => :label_spent_time},
                 {:name => 'ProjectCustomField', :partial => 'custom_fields/index',
                  :label => :label_project_plural},
                 {:name => 'VersionCustomField', :partial => 'custom_fields/index',
                  :label => :label_version_plural},
                 {:name => 'UserCustomField', :partial => 'custom_fields/index',
                  :label => :label_user_plural},
                 {:name => 'GroupCustomField', :partial => 'custom_fields/index',
                  :label => :label_group_plural},
                 {:name => 'TimeEntryActivityCustomField', :partial => 'custom_fields/index',
                  :label => TimeEntryActivity::OptionName},
                 {:name => 'IssuePriorityCustomField', :partial => 'custom_fields/index',
                  :label => IssuePriority::OptionName},
                 {:name => 'DocumentCategoryCustomField', :partial => 'custom_fields/index',
                  :label => DocumentCategory::OptionName}
               ]
               def custom_fields_tabs
                 CUSTOM_FIELDS_TABS
               end
               # Return custom field html tag corresponding to its format
               def custom_field_tag(name, custom_value)
                 custom_field = custom_value.custom_field
                 field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                 field_name << "[]" if custom_field.multiple?
                 field_id = "#{name}_custom_field_values_#{custom_field.id}"
                 tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
                 field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
                 case field_format.try(:edit_as)
                 when "date"
                   text_field_tag(field_name, custom_value.value, tag_options.merge(:size => 10)) +
                   calendar_for(field_id)
                 when "text"
                   text_area_tag(field_name, custom_value.value, tag_options.merge(:rows => 3))
                 when "bool"
                   hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, tag_options)
                 when "list"
                   blank_option = ''.html_safe
                   unless custom_field.multiple?
                     if custom_field.is_required?
                       unless custom_field.default_value.present?
                         blank_option = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---", :value => '')
                       end
                     else
                       blank_option = content_tag('option')
                     end
                   end
                   s = select_tag(field_name, blank_option + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value),
                     tag_options.merge(:multiple => custom_field.multiple?))
                   if custom_field.multiple?
                     s << hidden_field_tag(field_name, '')
                   end
                   s
                 else
                   text_field_tag(field_name, custom_value.value, tag_options)
                 end
               end
               # Return custom field label tag
               def custom_field_label_tag(name, custom_value, options={})
                 required = options[:required] || custom_value.custom_field.is_required?
                 content_tag "label", h(custom_value.custom_field.name) +
                   (required ? " <span class=\"required\">*</span>".html_safe : ""),
                   :for => "#{name}_custom_field_values_#{custom_value.custom_field.id}"
               end
               # Return custom field tag with its label tag
               def custom_field_tag_with_label(name, custom_value, options={})
                 custom_field_label_tag(name, custom_value, options) + custom_field_tag(name, custom_value)
               end
               def custom_field_tag_for_bulk_edit(name, custom_field, projects=nil, value='')
                 field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                 field_name << "[]" if custom_field.multiple?
                 field_id = "#{name}_custom_field_values_#{custom_field.id}"
                 tag_options = {:id => field_id, :class => "#{custom_field.field_format}_cf"}
+                unset_tag = ''
+                unless custom_field.is_required?
+                  unset_tag = content_tag('label',
+                    check_box_tag(field_name, '__none__', (value == '__none__'), :id => nil, :data => {:disables => "##{field_id}"}) + l(:button_clear),
+                    :class => 'inline'
+                  )
+                end
                 field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
                 case field_format.try(:edit_as)
                   when "date"
                     text_field_tag(field_name, value, tag_options.merge(:size => 10)) +
-                    calendar_for(field_id)
+                    calendar_for(field_id) +
+                    unset_tag
                   when "text"
-                    text_area_tag(field_name, value, tag_options.merge(:rows => 3))
+                    text_area_tag(field_name, value, tag_options.merge(:rows => 3)) +
+                    '<br />'.html_safe +
+                    unset_tag
                   when "bool"
                     select_tag(field_name, options_for_select([[l(:label_no_change_option), ''],
                                                                [l(:general_text_yes), '1'],
                                                                [l(:general_text_no), '0']], value), tag_options)
                   when "list"
                     options = []
                     options << [l(:label_no_change_option), ''] unless custom_field.multiple?
                     options << [l(:label_none), '__none__'] unless custom_field.is_required?
                     options += custom_field.possible_values_options(projects)
                     select_tag(field_name, options_for_select(options, value), tag_options.merge(:multiple => custom_field.multiple?))
                   else
-                    text_field_tag(field_name, value, tag_options)
+                    text_field_tag(field_name, value, tag_options) +
+                    unset_tag
                 end
               end
               # Return a string used to display a custom value
               def show_value(custom_value)
                 return "" unless custom_value
                 format_value(custom_value.value, custom_value.custom_field.field_format)
               end
               # Return a string used to display a custom value
               def format_value(value, field_format)
                 if value.is_a?(Array)
                   value.collect {|v| format_value(v, field_format)}.compact.sort.join(', ')
                 else
                   Redmine::CustomFieldFormat.format_value(value, field_format)
                 end
               end
               # Return an array of custom field formats which can be used in select_tag
               def custom_field_formats_for_select(custom_field)
                 Redmine::CustomFieldFormat.as_select(custom_field.class.customized_class.name)
               end
               # Renders the custom_values in api views
               def render_api_custom_values(custom_values, api)
                 api.array :custom_fields do
                   custom_values.each do |custom_value|
                     attrs = {:id => custom_value.custom_field_id, :name => custom_value.custom_field.name}
                     attrs.merge!(:multiple => true) if custom_value.custom_field.multiple?
                     api.custom_field attrs do
                       if custom_value.value.is_a?(Array)
                         api.array :value do
                           custom_value.value.each do |value|
                             api.value value unless value.blank?
                           end
                         end
                       else
                         api.value custom_value.value
                       end
                     end
                   end
                 end unless custom_values.empty?
               end
             end

app/views/issues/bulk_edit.html.erb +18 0

             <h2><%= @copy ? l(:button_copy) : l(:label_bulk_edit_selected_issues) %></h2>
             <% if @saved_issues && @unsaved_issues.present? %>
             <div id="errorExplanation">
               <span>
                 <%= l(:notice_failed_to_save_issues,
                     :count => @unsaved_issues.size,
                     :total => @saved_issues.size,
                     :ids => @unsaved_issues.map {|i| "##{i.id}"}.join(', ')) %>
               </span>
               <ul>
               <% bulk_edit_error_messages(@unsaved_issues).each do |message| %>
                 <li><%= message %></li>
               <% end %>
               </ul>
             </div>
             <% end %>
             <ul id="bulk-selection">
             <% @issues.each do |issue| %>
               <%= content_tag 'li', link_to_issue(issue) %>
             <% end %>
             </ul>
             <%= form_tag(bulk_update_issues_path, :id => 'bulk_edit_form') do %>
             <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %>
             <div class="box tabular">
             <fieldset class="attributes">
             <legend><%= l(:label_change_properties) %></legend>
             <div class="splitcontentleft">
             <% if @allowed_projects.present? %>
             <p>
               <label for="issue_project_id"><%= l(:field_project) %></label>
               <%= select_tag('issue[project_id]',
                              content_tag('option', l(:label_no_change_option), :value => '') +
                                project_tree_options_for_select(@allowed_projects, :selected => @target_project),
                              :onchange => "updateBulkEditFrom('#{escape_javascript url_for(:action => 'bulk_edit', :format => 'js')}')") %>
             </p>
             <% end %>
             <p>
               <label for="issue_tracker_id"><%= l(:field_tracker) %></label>
               <%= select_tag('issue[tracker_id]',
                              content_tag('option', l(:label_no_change_option), :value => '') +
                                options_from_collection_for_select(@trackers, :id, :name, @issue_params[:tracker_id])) %>
             </p>
             <% if @available_statuses.any? %>
             <p>
               <label for='issue_status_id'><%= l(:field_status) %></label>
               <%= select_tag('issue[status_id]',
                              content_tag('option', l(:label_no_change_option), :value => '') +
                                options_from_collection_for_select(@available_statuses, :id, :name, @issue_params[:status_id])) %>
             </p>
             <% end %>
             <% if @safe_attributes.include?('priority_id') -%>
             <p>
               <label for='issue_priority_id'><%= l(:field_priority) %></label>
               <%= select_tag('issue[priority_id]',
                              content_tag('option', l(:label_no_change_option), :value => '') +
                                options_from_collection_for_select(IssuePriority.active, :id, :name, @issue_params[:priority_id])) %>
             </p>
             <% end %>
             <% if @safe_attributes.include?('assigned_to_id') -%>
             <p>
               <label for='issue_assigned_to_id'><%= l(:field_assigned_to) %></label>
               <%= select_tag('issue[assigned_to_id]',
                              content_tag('option', l(:label_no_change_option), :value => '') +
                                content_tag('option', l(:label_nobody), :value => 'none', :selected => (@issue_params[:assigned_to_id] == 'none')) +
                                principals_options_for_select(@assignables, @issue_params[:assigned_to_id])) %>
             </p>
             <% end %>
             <% if @safe_attributes.include?('category_id') -%>
             <p>
               <label for='issue_category_id'><%= l(:field_category) %></label>
               <%= select_tag('issue[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                             content_tag('option', l(:label_none), :value => 'none', :selected => (@issue_params[:category_id] == 'none')) +
                                             options_from_collection_for_select(@categories, :id, :name, @issue_params[:category_id])) %>
             </p>
             <% end %>
             <% if @safe_attributes.include?('fixed_version_id') -%>
             <p>
               <label for='issue_fixed_version_id'><%= l(:field_fixed_version) %></label>
               <%= select_tag('issue[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                                content_tag('option', l(:label_none), :value => 'none', :selected => (@issue_params[:fixed_version_id] == 'none')) +
                                                version_options_for_select(@versions.sort, @issue_params[:fixed_version_id])) %>
             </p>
             <% end %>
             <% @custom_fields.each do |custom_field| %>
               <p>
                 <label><%= h(custom_field.name) %></label>
                 <%= custom_field_tag_for_bulk_edit('issue', custom_field, @projects, @issue_params[:custom_field_values][custom_field.id.to_s]) %>
               </p>
             <% end %>
             <% if @copy && @attachments_present %>
             <%= hidden_field_tag 'copy_attachments', '0' %>
             <p>
               <label for='copy_attachments'><%= l(:label_copy_attachments) %></label>
               <%= check_box_tag 'copy_attachments', '1', params[:copy_attachments] != '0' %>
             </p>
             <% end %>
             <% if @copy && @subtasks_present %>
             <%= hidden_field_tag 'copy_subtasks', '0' %>
             <p>
               <label for='copy_subtasks'><%= l(:label_copy_subtasks) %></label>
               <%= check_box_tag 'copy_subtasks', '1', params[:copy_subtasks] != '0' %>
             </p>
             <% end %>
             <%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
             </div>
             <div class="splitcontentright">
             <% if @safe_attributes.include?('is_private') %>
             <p>
               <label for='issue_is_private'><%= l(:field_is_private) %></label>
               <%= select_tag('issue[is_private]', content_tag('option', l(:label_no_change_option), :value => '') +
                                             content_tag('option', l(:general_text_Yes), :value => '1', :selected => (@issue_params[:is_private] == '1')) +
                                             content_tag('option', l(:general_text_No), :value => '0', :selected => (@issue_params[:is_private] == '0'))) %>
             </p>
             <% end %>
             <% if @safe_attributes.include?('parent_issue_id') && @project %>
             <p>
               <label for='issue_parent_issue_id'><%= l(:field_parent_issue) %></label>
               <%= text_field_tag 'issue[parent_issue_id]', '', :size => 10, :value => @issue_params[:parent_issue_id] %>
+              <label class="inline"><%= check_box_tag 'issue[parent_issue_id]', 'none', (@issue_params[:parent_issue_id] == 'none'), :id => nil, :data => {:disables => '#issue_parent_issue_id'} %><%= l(:button_clear) %></label>
             </p>
             <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @project)}')" %>
             <% end %>
             <% if @safe_attributes.include?('start_date') %>
             <p>
               <label for='issue_start_date'><%= l(:field_start_date) %></label>
               <%= text_field_tag 'issue[start_date]', '', :value => @issue_params[:start_date], :size => 10 %><%= calendar_for('issue_start_date') %>
+              <label class="inline"><%= check_box_tag 'issue[start_date]', 'none', (@issue_params[:start_date] == 'none'), :id => nil, :data => {:disables => '#issue_start_date'} %><%= l(:button_clear) %></label>
             </p>
             <% end %>
             <% if @safe_attributes.include?('due_date') %>
             <p>
               <label for='issue_due_date'><%= l(:field_due_date) %></label>
               <%= text_field_tag 'issue[due_date]', '', :value => @issue_params[:due_date], :size => 10 %><%= calendar_for('issue_due_date') %>
+              <label class="inline"><%= check_box_tag 'issue[due_date]', 'none', (@issue_params[:due_date] == 'none'), :id => nil, :data => {:disables => '#issue_due_date'} %><%= l(:button_clear) %></label>
             </p>
             <% end %>
             <% if @safe_attributes.include?('done_ratio') && Issue.use_field_for_done_ratio? %>
             <p>
               <label for='issue_done_ratio'><%= l(:field_done_ratio) %></label>
               <%= select_tag 'issue[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }, @issue_params[:done_ratio]) %>
             </p>
             <% end %>
             </div>
             </fieldset>
             <fieldset>
             <legend><%= l(:field_notes) %></legend>
             <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
             <%= wikitoolbar_for 'notes' %>
             </fieldset>
             </div>
             <p>
               <% if @copy %>
                 <%= hidden_field_tag 'copy', '1' %>
                 <%= submit_tag l(:button_copy) %>
                 <%= submit_tag l(:button_copy_and_follow), :name => 'follow' %>
               <% elsif @target_project %>
                 <%= submit_tag l(:button_move) %>
                 <%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
               <% else %>
                 <%= submit_tag l(:button_submit) %>
               <% end %>
             </p>
             <% end %>
+            <%= javascript_tag do %>
+            $(window).load(function(){
+              $(document).on('change', 'input[data-disables]', function(){
+                if ($(this).attr('checked')){
+                  $($(this).data('disables')).attr('disabled', true).val('');
+                } else {
+                  $($(this).data('disables')).attr('disabled', false);
+                }
+              });
+            });
+            $(document).ready(function(){
+              $('input[data-disables]').trigger('change');
+            });
+            <% end %>

test/functional/issues_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages