summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-07-06 06:01:50 +0000
committerGo MAEDA <maeda@farend.jp>2021-07-06 06:01:50 +0000
commit7f965286ed6b1d7e906e8662daba0d49b1cf7666 (patch)
treeaea4a14340b1e4ec29743bddf2cdef5f9b643206 /app/views
parent1b0bf2880374307e9669cfd4ed32cfe6677a3503 (diff)
downloadredmine-7f965286ed6b1d7e906e8662daba0d49b1cf7666.tar.gz
redmine-7f965286ed6b1d7e906e8662daba0d49b1cf7666.zip
Default issue query (#7360).
Patch by Katsuya HIDAKA (the author of https://github.com/hidakatsuya/redmine_default_custom_query), Takenori TAKAKI, Olivier Chabert, and Jens Krämer. git-svn-id: http://svn.redmine.org/redmine/trunk@21061 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/settings/_issues.html.erb4
-rw-r--r--app/views/settings/_issues.html.erb2
-rw-r--r--app/views/users/_preferences.html.erb1
3 files changed, 7 insertions, 0 deletions
diff --git a/app/views/projects/settings/_issues.html.erb b/app/views/projects/settings/_issues.html.erb
index 27e792d22..a0f0c14d5 100644
--- a/app/views/projects/settings/_issues.html.erb
+++ b/app/views/projects/settings/_issues.html.erb
@@ -41,6 +41,10 @@
<% if @project.safe_attribute?('default_assigned_to_id') %>
<p><%= f.select :default_assigned_to_id, project_default_assigned_to_options(@project), include_blank: l(:label_none) %></p>
<% end %>
+
+ <% if @project.safe_attribute?('default_issue_query_id') %>
+ <p><%= f.select :default_issue_query_id, project_default_issue_query_options(@project), include_blank: l(:label_none) %><em class="info"><%=l 'text_allowed_queries_to_select' %></em></p>
+ <% end %>
</div>
<p><%= submit_tag l(:button_save) %></p>
diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb
index b4e50d8e3..3eb7a07a1 100644
--- a/app/views/settings/_issues.html.erb
+++ b/app/views/settings/_issues.html.erb
@@ -47,6 +47,8 @@
IssueQuery.new(:totalable_names => Setting.issue_list_default_totals).available_totalable_columns.map {|c| [c.caption, c.name.to_s]},
:inline => true,
:label => :label_total_plural %></p>
+
+ <p><%= setting_select :default_issue_query, default_global_issue_query_options %></p>
</fieldset>
<%= submit_tag l(:button_save) %>
diff --git a/app/views/users/_preferences.html.erb b/app/views/users/_preferences.html.erb
index 3734c3064..8074cb569 100644
--- a/app/views/users/_preferences.html.erb
+++ b/app/views/users/_preferences.html.erb
@@ -7,4 +7,5 @@
<p><%= pref_fields.text_field :recently_used_projects, :size => 2 %></p>
<p><%= pref_fields.select :history_default_tab, history_default_tab_options %></p>
<p><%= pref_fields.text_area :toolbar_language_options, :rows => 4 %></p>
+<p><%= pref_fields.select :default_issue_query, default_issue_query_options(@user), include_blank: l(:label_none) %></p>
<% end %>