summaryrefslogtreecommitdiffstats
path: root/app/views/my
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-03-16 18:02:43 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-03-16 18:02:43 +0000
commit4cfd5133733a08ebf5ba89aa3994e4a86679c809 (patch)
tree562cc4d5d11453a058134de4aa95c2c9f121ebf5 /app/views/my
parent1a180a67be5c205653e5d006fd027c0cafb3b597 (diff)
downloadredmine-4cfd5133733a08ebf5ba89aa3994e4a86679c809.tar.gz
redmine-4cfd5133733a08ebf5ba89aa3994e4a86679c809.zip
Allow multiple instances of custom queries on My page (#1565).
git-svn-id: http://svn.redmine.org/redmine/trunk@16413 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/my')
-rw-r--r--app/views/my/blocks/_issue_query_selection.html.erb21
-rw-r--r--app/views/my/blocks/_issues.erb28
2 files changed, 21 insertions, 28 deletions
diff --git a/app/views/my/blocks/_issue_query_selection.html.erb b/app/views/my/blocks/_issue_query_selection.html.erb
new file mode 100644
index 000000000..64a3f32af
--- /dev/null
+++ b/app/views/my/blocks/_issue_query_selection.html.erb
@@ -0,0 +1,21 @@
+<% visible_queries = IssueQuery.visible.sorted %>
+
+<h3>
+ <%= l(:label_issue_plural) %>
+</h3>
+
+<div id="<%= block %>-settings">
+ <%= form_tag(my_page_path, :remote => true) do %>
+ <div class="box">
+ <p>
+ <label>
+ <%= l(:label_query) %>
+ <%= select_tag "settings[#{block}][query_id]", content_tag("option") + options_from_collection_for_select(visible_queries, :id, :name, settings[:query_id]) %>
+ </label>
+ </p>
+ </div>
+ <p>
+ <%= submit_tag l(:button_save) %>
+ </p>
+ <% end %>
+</div>
diff --git a/app/views/my/blocks/_issues.erb b/app/views/my/blocks/_issues.erb
index 47fb28136..845ef5b85 100644
--- a/app/views/my/blocks/_issues.erb
+++ b/app/views/my/blocks/_issues.erb
@@ -1,6 +1,3 @@
-<% issues, query = issues_items(block, settings) %>
-
-<% if query %>
<div class="contextual">
<%= link_to_function l(:label_options), "$('##{block}-settings').toggle();", :class => 'icon-only icon-settings', :title => l(:label_options) %>
</div>
@@ -42,28 +39,3 @@
_project_issues_path(query.project, query.as_params.merge(:format => 'atom', :key => User.current.rss_key)),
{:title => query.name}) %>
<% end %>
-
-<% else %>
-<% visible_queries = IssueQuery.visible.sorted %>
-
-<h3>
- <%= l(:label_issue_plural) %>
-</h3>
-
-<div id="<%= block %>-settings">
- <%= form_tag(my_page_path, :remote => true) do %>
- <div class="box">
- <p>
- <label>
- <%= l(:label_query) %>
- <%= select_tag 'settings[issuequery][query_id]', content_tag("option") + options_from_collection_for_select(visible_queries, :id, :name, settings[:query_id]) %>
- </label>
- </p>
- </div>
- <p>
- <%= submit_tag l(:button_save) %>
- </p>
- <% end %>
-</div>
-
-<% end %>