##// END OF EJS Templates
jro_apps » redmine
RSS
Default columns displayed on the issue list can now be selected at application level....
Jean-Philippe Lang -
r774:c6e61a5f1976
parent child
Show More
Show file before | Show file after | Hide comments
@@ -16,12 +16,11
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class QueryColumn
19 attr_accessor :name, :sortable, :default
19 attr_accessor :name, :sortable
20 20
21 21 def initialize(name, options={})
22 22 self.name = name
23 23 self.sortable = options[:sortable]
24 self.default = options[:default]
25 24 end
26 25
27 26 def default?; default end
@@ -73,12 +72,12 class Query < ActiveRecord::Base
73 72 cattr_reader :operators_by_filter_type
74 73
75 74 @@available_columns = [
76 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :default => true),
77 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :default => true),
78 QueryColumn.new(:priority, :sortable => "#{Issue.table_name}.priority_id", :default => true),
79 QueryColumn.new(:subject, :default => true),
80 QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname", :default => true),
81 QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default => true),
75 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position"),
76 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
77 QueryColumn.new(:priority, :sortable => "#{Issue.table_name}.priority_id"),
78 QueryColumn.new(:subject),
79 QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
80 QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on"),
82 81 QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
83 82 QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
84 83 QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
@@ -209,7 +208,7 class Query < ActiveRecord::Base
209 208
210 209 def columns
211 210 if has_default_columns?
212 available_columns.select {|c| c.default? }
211 available_columns.select {|c| Setting.issue_list_default_columns.include?(c.name.to_s) }
213 212 else
214 213 # preserve the column_names order
215 214 column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
Show file before | Show file after | Hide comments
@@ -1,8 +1,8
1 1 <h2><%= l(:label_settings) %></h2>
2 2
3 3 <div id="settings">
4 <% form_tag({:action => 'edit'}, :class => "tabular") do %>
5 <div class="box">
4 <% form_tag({:action => 'edit'}) do %>
5 <div class="box tabular">
6 6 <p><label><%= l(:setting_app_title) %></label>
7 7 <%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p>
8 8
@@ -50,7 +50,15
50 50 <%= check_box_tag 'settings[sys_api_enabled]', 1, Setting.sys_api_enabled? %><%= hidden_field_tag 'settings[sys_api_enabled]', 0 %></p>
51 51 </div>
52 52
53 <fieldset class="box"><legend><%= l(:label_authentication) %></legend>
53 <fieldset class="box"><legend><%= l(:setting_issue_list_default_columns) %></legend>
54 <%= hidden_field_tag 'settings[issue_list_default_columns][]', '' %>
55 <p><% Query.available_columns.each do |column| %>
56 <label><%= check_box_tag 'settings[issue_list_default_columns][]', column.name, Setting.issue_list_default_columns.include?(column.name.to_s) %>
57 <%= l("field_#{column.name}") %></label>
58 <% end %></p>
59 </fieldset>
60
61 <fieldset class="box tabular"><legend><%= l(:label_authentication) %></legend>
54 62 <p><label><%= l(:setting_login_required) %></label>
55 63 <%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
56 64
@@ -64,7 +72,7
64 72 <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
65 73 </fieldset>
66 74
67 <fieldset class="box"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
75 <fieldset class="box tabular"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
68 76 <p><label><%= l(:setting_commit_ref_keywords) %></label>
69 77 <%= text_field_tag 'settings[commit_ref_keywords]', Setting.commit_ref_keywords, :size => 30 %><br /><em><%= l(:text_comma_separated) %></em></p>
70 78
Show file before | Show file after | Hide comments
@@ -79,4 +79,13 notified_events:
79 79 default: --
80 80 - issue_added
81 81 - issue_updated
82 issue_list_default_columns:
83 serialized: true
84 default: --
85 - tracker
86 - status
87 - priority
88 - subject
89 - assigned_to
90 - updated_on
82 91 No newline at end of file
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 515 label_default_columns: Default columns
516 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 field_estimated_hours: Estimated time
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 515 label_default_columns: Default columns
516 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 515 label_default_columns: Default columns
516 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -181,6 +181,7 setting_commit_fix_keywords: Fixing keywords
181 181 setting_autologin: Autologin
182 182 setting_date_format: Date format
183 183 setting_cross_project_issue_relations: Allow cross-project issue relations
184 setting_issue_list_default_columns: Default columns displayed on the issue list
184 185
185 186 label_user: User
186 187 label_user_plural: Users
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 515 label_default_columns: Default columns
516 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -181,6 +181,7 setting_commit_fix_keywords: Mot-clés de résolution
181 181 setting_autologin: Autologin
182 182 setting_date_format: Format de date
183 183 setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
184 setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes
184 185
185 186 label_user: Utilisateur
186 187 label_user_plural: Utilisateurs
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 515 label_default_columns: Default columns
516 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -514,3 +514,4 label_file_plural: Files
514 514 label_changeset_plural: Changesets
515 515 field_column_names: Columns
516 516 label_default_columns: Default columns
517 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -514,3 +514,4 label_file_plural: Files
514 514 label_changeset_plural: Changesets
515 515 field_column_names: Columns
516 516 label_default_columns: Default columns
517 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 label_file_plural: Pliki
513 513 label_changeset_plural: Zestawienia zmian
514 514 field_column_names: Columns
515 515 label_default_columns: Default columns
516 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 515 label_default_columns: Default columns
516 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 515 label_default_columns: Default columns
516 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 515 label_default_columns: Default columns
516 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -514,3 +514,4 label_file_plural: Files
514 514 label_changeset_plural: Changesets
515 515 field_column_names: Columns
516 516 label_default_columns: Default columns
517 setting_issue_list_default_columns: Default columns displayed on the issue list
Show file before | Show file after | Hide comments
@@ -516,3 +516,4 label_file_plural: Files
516 516 label_changeset_plural: Changesets
517 517 field_column_names: Columns
518 518 label_default_columns: Default columns
519 setting_issue_list_default_columns: Default columns displayed on the issue list
General Comments 0
You need to be logged in to leave comments. Login now