mirror of
https://github.com/redmine/redmine.git
synced 2025-12-16 05:20:28 +01:00
Set default columns for the projects list (#29482).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@18766 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -274,6 +274,6 @@ class ProjectsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def retrieve_project_query
|
def retrieve_project_query
|
||||||
retrieve_query(ProjectQuery, false)
|
retrieve_query(ProjectQuery, false, :defaults => @default_columns_names)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ class ProjectQuery < Query
|
|||||||
end
|
end
|
||||||
|
|
||||||
def default_columns_names
|
def default_columns_names
|
||||||
@default_columns_names ||= [:name, :identifier, :short_description]
|
@default_columns_names = Setting.project_list_defaults.symbolize_keys[:column_names].map(&:to_sym)
|
||||||
end
|
end
|
||||||
|
|
||||||
def default_sort_criteria
|
def default_sort_criteria
|
||||||
|
|||||||
@@ -16,5 +16,13 @@
|
|||||||
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
|
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<fieldset class="box">
|
||||||
|
<legend><%= l(:setting_project_list_defaults) %></legend>
|
||||||
|
<% query = ProjectQuery.new(Setting.project_list_defaults) %>
|
||||||
|
<%= render_query_columns_selection(query,
|
||||||
|
:name => 'settings[project_list_defaults][column_names]') %>
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
|
|
||||||
<%= submit_tag l(:button_save) %>
|
<%= submit_tag l(:button_save) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -484,6 +484,7 @@ en:
|
|||||||
setting_timelog_max_hours_per_day: Maximum hours that can be logged per day and user
|
setting_timelog_max_hours_per_day: Maximum hours that can be logged per day and user
|
||||||
setting_timelog_accept_future_dates: Accept time logs on future dates
|
setting_timelog_accept_future_dates: Accept time logs on future dates
|
||||||
setting_show_status_changes_in_mail_subject: Show status changes in issue mail notifications subject
|
setting_show_status_changes_in_mail_subject: Show status changes in issue mail notifications subject
|
||||||
|
setting_project_list_defaults: Projects list defaults
|
||||||
|
|
||||||
permission_add_project: Create project
|
permission_add_project: Create project
|
||||||
permission_add_subprojects: Create subprojects
|
permission_add_subprojects: Create subprojects
|
||||||
|
|||||||
@@ -230,6 +230,13 @@ time_entry_list_defaults:
|
|||||||
- hours
|
- hours
|
||||||
totalable_names:
|
totalable_names:
|
||||||
- hours
|
- hours
|
||||||
|
project_list_defaults:
|
||||||
|
serialized: true
|
||||||
|
default:
|
||||||
|
column_names:
|
||||||
|
- name
|
||||||
|
- identifier
|
||||||
|
- short_description
|
||||||
issue_done_ratio:
|
issue_done_ratio:
|
||||||
default: 'issue_field'
|
default: 'issue_field'
|
||||||
default_projects_public:
|
default_projects_public:
|
||||||
|
|||||||
@@ -147,6 +147,16 @@ class ProjectsControllerTest < Redmine::ControllerTest
|
|||||||
assert_include 'idnt-2', child_level2
|
assert_include 'idnt-2', child_level2
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_index_with_default_query_setting
|
||||||
|
with_settings :project_list_defaults => {'column_names' => %w(name short_description status)} do
|
||||||
|
get :index, :params => {
|
||||||
|
:display_type => 'list'
|
||||||
|
}
|
||||||
|
assert_response :success
|
||||||
|
end
|
||||||
|
assert_equal ['Name', 'Description', 'Status'], columns_in_list
|
||||||
|
end
|
||||||
|
|
||||||
def test_autocomplete_js
|
def test_autocomplete_js
|
||||||
get :autocomplete, :params => {
|
get :autocomplete, :params => {
|
||||||
:format => 'js',
|
:format => 'js',
|
||||||
|
|||||||
Reference in New Issue
Block a user