mirror of
https://github.com/redmine/redmine.git
synced 2025-12-16 05:20:28 +01:00
Add system setting for default results display format of project query (#32818).
Patch by Takenori TAKAKI and Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@19505 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -82,6 +82,10 @@ class ProjectQuery < Query
|
||||
@default_columns_names = Setting.project_list_defaults.symbolize_keys[:column_names].map(&:to_sym)
|
||||
end
|
||||
|
||||
def default_display_type
|
||||
Setting.project_list_display_type
|
||||
end
|
||||
|
||||
def default_sort_criteria
|
||||
[[]]
|
||||
end
|
||||
|
||||
@@ -766,6 +766,10 @@ class Query < ActiveRecord::Base
|
||||
[]
|
||||
end
|
||||
|
||||
def default_display_type
|
||||
self.available_display_types.first
|
||||
end
|
||||
|
||||
def column_names=(names)
|
||||
if names
|
||||
names = names.select {|n| n.is_a?(Symbol) || !n.blank? }
|
||||
@@ -997,7 +1001,7 @@ class Query < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def display_type
|
||||
options[:display_type] || self.available_display_types.first
|
||||
options[:display_type] || self.default_display_type
|
||||
end
|
||||
|
||||
def display_type=(type)
|
||||
|
||||
@@ -19,6 +19,13 @@
|
||||
<fieldset class="box">
|
||||
<legend><%= l(:setting_project_list_defaults) %></legend>
|
||||
<% query = ProjectQuery.new(Setting.project_list_defaults) %>
|
||||
<p>
|
||||
<label><%= l(:label_display_type) %></label>
|
||||
<% query.available_display_types.each do |t| %>
|
||||
<%= radio_button_tag('settings[project_list_display_type]', t, Setting.project_list_display_type == t, :id => "setting_project_list_display_type_#{t}") %>
|
||||
<%= content_tag('label', l(:"label_display_type_#{t}"), :for => "settings_project_list_display_type_#{t}", :class => "inline") %>
|
||||
<% end %>
|
||||
</p>
|
||||
<%= render_query_columns_selection(query,
|
||||
:name => 'settings[project_list_defaults][column_names]') %>
|
||||
</fieldset>
|
||||
|
||||
Reference in New Issue
Block a user