##// END OF EJS Templates
Ability to set default column order in issue list (#11068)....
Jean-Philippe Lang -
r9597:77bac4b14d3b
parent child
Show More
@@ -17,10 +17,10
17 <td>
17 <td>
18 <%= label_tag "selected_columns", l(:description_selected_columns) %>
18 <%= label_tag "selected_columns", l(:description_selected_columns) %>
19 <br />
19 <br />
20 <%= select_tag 'c[]',
20 <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'),
21 options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
21 options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
22 :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px",
22 :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px",
23 :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);" %>
23 :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %>
24 </td>
24 </td>
25 <td class="buttons">
25 <td class="buttons">
26 <input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
26 <input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
@@ -1,4 +1,4
1 <%= form_tag({:action => 'edit', :tab => 'issues'}) do %>
1 <%= form_tag({:action => 'edit', :tab => 'issues'}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
2
2
3 <div class="box tabular settings">
3 <div class="box tabular settings">
4 <p><%= setting_check_box :cross_project_issue_relations %></p>
4 <p><%= setting_check_box :cross_project_issue_relations %></p>
@@ -16,9 +16,13
16 <p><%= setting_text_field :gantt_items_limit, :size => 6 %></p>
16 <p><%= setting_text_field :gantt_items_limit, :size => 6 %></p>
17 </div>
17 </div>
18
18
19 <fieldset class="box settings"><legend><%= l(:setting_issue_list_default_columns) %></legend>
19 <fieldset class="box">
20 <%= setting_multiselect(:issue_list_default_columns,
20 <legend><%= l(:setting_issue_list_default_columns) %></legend>
21 Query.new.available_columns.collect {|c| [c.caption, c.name.to_s]}, :label => false) %>
21 <%= render :partial => 'queries/columns',
22 :locals => {
23 :query => Query.new(:column_names => Setting.issue_list_default_columns),
24 :tag_name => 'settings[issue_list_default_columns][]'
25 } %>
22 </fieldset>
26 </fieldset>
23
27
24 <%= submit_tag l(:button_save) %>
28 <%= submit_tag l(:button_save) %>
@@ -46,6 +46,26 class SettingsControllerTest < ActionController::TestCase
46 assert_tag 'input', :attributes => {:name => 'settings[enabled_scm][]', :value => ''}
46 assert_tag 'input', :attributes => {:name => 'settings[enabled_scm][]', :value => ''}
47 end
47 end
48
48
49 def test_get_edit_should_preselect_default_issue_list_columns
50 with_settings :issue_list_default_columns => %w(tracker subject status updated_on) do
51 get :edit
52 assert_response :success
53 end
54
55 assert_select 'select[id=selected_columns][name=?]', 'settings[issue_list_default_columns][]' do
56 assert_select 'option', 4
57 assert_select 'option[value=tracker]', :text => 'Tracker'
58 assert_select 'option[value=subject]', :text => 'Subject'
59 assert_select 'option[value=status]', :text => 'Status'
60 assert_select 'option[value=updated_on]', :text => 'Updated'
61 end
62
63 assert_select 'select[id=available_columns]' do
64 assert_select 'option[value=tracker]', 0
65 assert_select 'option[value=priority]', :text => 'Priority'
66 end
67 end
68
49 def test_post_edit_notifications
69 def test_post_edit_notifications
50 post :edit, :settings => {:mail_from => 'functional@test.foo',
70 post :edit, :settings => {:mail_from => 'functional@test.foo',
51 :bcc_recipients => '0',
71 :bcc_recipients => '0',
General Comments 0
You need to be logged in to leave comments. Login now