jro_apps/redmine Commit - r9597:77bac4b14d3b

Ability to set default column order in issue list (#11068)....

Jean-Philippe Lang -

r9597:77bac4b14d3b

parent child

Context file:

r9597:77bac4b14d3b

Collapse all files

app/views/queries/_columns.html.erb +2 -2

             <table class="query-columns">
               <tr>
                 <td style="padding-left:0">
                   <%= label_tag "available_columns", l(:description_available_columns) %>
                   <br />
                   <%= select_tag 'available_columns',
                           options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
                           :multiple => true, :size => 10, :style => "width:150px",
                           :ondblclick => "moveOptions(this.form.available_columns, this.form.selected_columns);" %>
                 </td>
                 <td class="buttons">
                   <input type="button" value="&#8594;"
                    onclick="moveOptions(this.form.available_columns, this.form.selected_columns);" /><br />
                   <input type="button" value="&#8592;"
                    onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
                 </td>
                 <td>
                   <%= label_tag "selected_columns", l(:description_selected_columns) %>
                   <br />
-                  <%= select_tag 'c[]',
+                  <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'),
                           options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
                           :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px",
-                          :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);" %>
+                          :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %>
                 </td>
                 <td class="buttons">
                   <input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
                   <input type="button" value="&#8595;" onclick="moveOptionDown(this.form.selected_columns);" />
                 </td>
               </tr>
             </table>
             <% content_for :header_tags do %>
             <%= javascript_include_tag 'select_list_move' %>
             <% end %>

app/views/settings/_issues.html.erb +8 -4

-            <%= form_tag({:action => 'edit', :tab => 'issues'}) do %>
+            <%= form_tag({:action => 'edit', :tab => 'issues'}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
             <div class="box tabular settings">
             <p><%= setting_check_box :cross_project_issue_relations %></p>
             <p><%= setting_check_box :issue_group_assignment %></p>
             <p><%= setting_check_box :default_issue_start_date_to_creation_date %></p>
             <p><%= setting_check_box :display_subprojects_issues %></p>
             <p><%= setting_select :issue_done_ratio, Issue::DONE_RATIO_OPTIONS.collect {|i| [l("setting_issue_done_ratio_#{i}"), i]} %></p>
             <p><%= setting_text_field :issues_export_limit, :size => 6 %></p>
             <p><%= setting_text_field :gantt_items_limit, :size => 6 %></p>
             </div>
-            <fieldset class="box settings"><legend><%= l(:setting_issue_list_default_columns) %></legend>
+            <fieldset class="box">
-            <%= setting_multiselect(:issue_list_default_columns,
+            	<legend><%= l(:setting_issue_list_default_columns) %></legend>
-                    Query.new.available_columns.collect {|c| [c.caption, c.name.to_s]}, :label => false) %>
+              <%= render :partial => 'queries/columns',
+                         :locals => {
+                           :query => Query.new(:column_names => Setting.issue_list_default_columns),
+                           :tag_name => 'settings[issue_list_default_columns][]'
+                         } %>
             </fieldset>
             <%= submit_tag l(:button_save) %>
             <% end %>

test/functional/settings_controller_test.rb +20 0

             # Redmine - project management software
             # Copyright (C) 2006-2012  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.
             require File.expand_path('../../test_helper', __FILE__)
             require 'settings_controller'
             # Re-raise errors caught by the controller.
             class SettingsController; def rescue_action(e) raise e end; end
             class SettingsControllerTest < ActionController::TestCase
               fixtures :users
               def setup
                 @controller = SettingsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'edit'
               end
               def test_get_edit
                 get :edit
                 assert_response :success
                 assert_template 'edit'
                 assert_tag 'input', :attributes => {:name => 'settings[enabled_scm][]', :value => ''}
               end
+              def test_get_edit_should_preselect_default_issue_list_columns
+                with_settings :issue_list_default_columns => %w(tracker subject status updated_on) do
+                  get :edit
+                  assert_response :success
+                end
+                assert_select 'select[id=selected_columns][name=?]', 'settings[issue_list_default_columns][]' do
+                  assert_select 'option', 4
+                  assert_select 'option[value=tracker]', :text => 'Tracker'
+                  assert_select 'option[value=subject]', :text => 'Subject'
+                  assert_select 'option[value=status]', :text => 'Status'
+                  assert_select 'option[value=updated_on]', :text => 'Updated'
+                end
+                assert_select 'select[id=available_columns]' do
+                  assert_select 'option[value=tracker]', 0
+                  assert_select 'option[value=priority]', :text => 'Priority'
+                end
+              end
               def test_post_edit_notifications
                 post :edit, :settings => {:mail_from => 'functional@test.foo',
                                           :bcc_recipients  => '0',
                                           :notified_events => %w(issue_added issue_updated news_added),
                                           :emails_footer => 'Test footer'
                                           }
                 assert_redirected_to '/settings/edit'
                 assert_equal 'functional@test.foo', Setting.mail_from
                 assert !Setting.bcc_recipients?
                 assert_equal %w(issue_added issue_updated news_added), Setting.notified_events
                 assert_equal 'Test footer', Setting.emails_footer
               end
               def test_get_plugin_settings
                 Setting.stubs(:plugin_foo).returns({'sample_setting' => 'Plugin setting value'})
                 ActionController::Base.append_view_path(File.join(Rails.root, "test/fixtures/plugins"))
                 Redmine::Plugin.register :foo do
                   settings :partial => "foo_plugin/foo_plugin_settings"
                 end
                 get :plugin, :id => 'foo'
                 assert_response :success
                 assert_template 'plugin'
                 assert_tag 'form', :attributes => {:action => '/settings/plugin/foo'},
                   :descendant => {:tag => 'input', :attributes => {:name => 'settings[sample_setting]', :value => 'Plugin setting value'}}
                 Redmine::Plugin.clear
               end
               def test_get_invalid_plugin_settings
                 get :plugin, :id => 'none'
                 assert_response 404
               end
               def test_post_plugin_settings
                 Setting.expects(:plugin_foo=).with({'sample_setting' => 'Value'}).returns(true)
                 Redmine::Plugin.register(:foo) {}
                 post :plugin, :id => 'foo', :settings => {'sample_setting' => 'Value'}
                 assert_redirected_to '/settings/plugin/foo'
               end
             end

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