jro_apps/redmine Commit - r11995:13e381d31de0

Projects selection on custom field form (#15136)....

Jean-Philippe Lang -

r11995:13e381d31de0

parent child

Context file:

r11995:13e381d31de0

Collapse all files

app/views/custom_fields/_form.html.erb +35 -14

              <%= error_messages_for 'custom_field' %>
+             <% if @custom_field.is_a?(IssueCustomField) %>
+             <div class="splitcontentleft">
+             <% end %>
              <div class="box tabular">
              <p><%= f.text_field :name, :required => true %></p>
              <p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %></p>
              <div class="box tabular">
              <% case @custom_field.class.name
              when "IssueCustomField" %>
-                 <fieldset><legend><%=l(:label_tracker_plural)%></legend>
-                 <% Tracker.sorted.all.each do |tracker| %>
-                   <%= check_box_tag "custom_field[tracker_ids][]",
-                                     tracker.id,
-                                     (@custom_field.trackers.include? tracker),
-                                     :id => "custom_field_tracker_ids_#{tracker.id}" %>
-                   <label class="no-css" for="custom_field_tracker_ids_<%=tracker.id%>">
-                     <%= h(tracker.name) %>
-                   </label>
-                 <% end %>
-                 <%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
-                 </fieldset>
-                 &nbsp;
                  <p><%= f.check_box :is_required %></p>
                  <p><%= f.check_box :is_for_all %></p>
                  <p><%= f.check_box :is_filter %></p>
              <% end %>
              <%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
              </div>
+             <%= submit_tag l(:button_save) %>
+             <% if @custom_field.is_a?(IssueCustomField) %>
+             </div>
+             <div class="splitcontentright">
+               <fieldset class="box"><legend><%=l(:label_tracker_plural)%></legend>
+               <% Tracker.sorted.all.each do |tracker| %>
+                 <%= check_box_tag "custom_field[tracker_ids][]",
+                                   tracker.id,
+                                   (@custom_field.trackers.include? tracker),
+                                   :id => "custom_field_tracker_ids_#{tracker.id}" %>
+                 <label class="no-css" for="custom_field_tracker_ids_<%=tracker.id%>">
+                   <%= h(tracker.name) %>
+                 </label>
+               <% end %>
+               <%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
+               </fieldset>
+               <fieldset class="box" id="custom_field_project_ids"><legend><%= l(:label_project_plural) %></legend>
+                 <%= render_project_nested_lists(Project.all) do |p|
+                   content_tag('label', check_box_tag('custom_field[project_ids][]', p.id, @custom_field.projects.to_a.include?(p), :id => nil) + ' ' + h(p))
+                 end %>
+                 <%= hidden_field_tag('custom_field[project_ids][]', '', :id => nil) %>
+                 <p><%= check_all_links 'custom_field_project_ids' %></p>
+               </fieldset>
+             </div>
+             <% end %>
              <% include_calendar_headers_tags %>
              }
              $("#custom_field_visible_on, #custom_field_visible_off").change(toggleCustomFieldRoles);
              $(document).ready(toggleCustomFieldRoles);
+             $("#custom_field_is_for_all").change(function(){
+               $("#custom_field_project_ids input").attr("disabled", $(this).is(":checked"));
+             }).trigger('change');
              <% end %>

app/views/custom_fields/edit.html.erb 0 -1

              <%= labelled_form_for :custom_field, @custom_field, :url => custom_field_path(@custom_field), :html => {:method => :put, :id => 'custom_field_form'} do |f| %>
              <%= render :partial => 'form', :locals => { :f => f } %>
-             <%= submit_tag l(:button_save) %>
              <% end %>

app/views/custom_fields/new.html.erb 0 -1

              <%= labelled_form_for :custom_field, @custom_field, :url => custom_fields_path, :html => {:id => 'custom_field_form'} do |f| %>
              <%= render :partial => 'form', :locals => { :f => f } %>
              <%= hidden_field_tag 'type', @custom_field.type %>
-             <%= submit_tag l(:button_save) %>
              <% end %>
              <%= javascript_tag do %>

public/javascripts/application.js +1 -5

                 Copyright (C) 2006-2013  Jean-Philippe Lang */
              function checkAll(id, checked) {
-               if (checked) {
-                 $('#'+id).find('input[type=checkbox]').attr('checked', true);
-               } else {
-                 $('#'+id).find('input[type=checkbox]').removeAttr('checked');
+               }
+               $('#'+id).find('input[type=checkbox]:enabled').attr('checked', checked);
              }
              function toggleCheckboxesBySelector(selector) {

public/stylesheets/application.css +1 -1

              #projects-index ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
              .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
-             #notified-projects ul, #tracker_project_ids ul {max-height:250px; overflow-y:auto;}
+             #notified-projects ul, #tracker_project_ids ul, #custom_field_project_ids ul {max-height:250px; overflow-y:auto;}
              #related-issues li img {vertical-align:middle;}

test/functional/custom_fields_controller_test.rb +24 -1

              require File.expand_path('../../test_helper', __FILE__)
              class CustomFieldsControllerTest < ActionController::TestCase
-               fixtures :custom_fields, :custom_values, :trackers, :users
+               fixtures :custom_fields, :custom_values, :trackers, :users, :projects
                def setup
                  @request.session[:user_id] = 1
                      assert_select 'option[value=user]', :text => 'User'
                      assert_select 'option[value=version]', :text => 'Version'
                    end
+                   assert_select 'input[type=checkbox][name=?]', 'custom_field[project_ids][]', Project.count
+                   assert_select 'input[type=hidden][name=?]', 'custom_field[project_ids][]', 1
                    assert_select 'input[type=hidden][name=type][value=IssueCustomField]'
                  end
                end
+               def test_new_time_entry_custom_field_should_not_show_trackers_and_projects
+                 get :new, :type => 'TimeEntryCustomField'
+                 assert_response :success
+                 assert_template 'new'
+                 assert_select 'form#custom_field_form' do
+                   assert_select 'input[name=?]', 'custom_field[tracker_ids][]', 0
+                   assert_select 'input[name=?]', 'custom_field[project_ids][]', 0
+                 end
+               end
                def test_default_value_should_be_an_input_for_string_custom_field
                  get :new, :type => 'IssueCustomField', :custom_field => {:field_format => 'string'}
                  assert_response :success
                  assert_equal 1, field.trackers.size
                end
+               def test_create_with_project_ids
+                 assert_difference 'CustomField.count' do
+                   post :create, :type => "IssueCustomField", :custom_field => {
+                     :name => "foo", :field_format => "string", :is_for_all => "0", :project_ids => ["1", "3", ""]
+                   }
+                   assert_response 302
+                 end
+                 field = IssueCustomField.order("id desc").first
+                 assert_equal [1, 3], field.projects.map(&:id).sort
+               end
                def test_create_with_failure
                  assert_no_difference 'CustomField.count' do
                    post :create, :type => "IssueCustomField", :custom_field => {:name => ''}

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