Browse Source

Load queries from the helper.

git-svn-id: http://svn.redmine.org/redmine/trunk@16416 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang 7 years ago
parent
commit
ea26846b81
2 changed files with 3 additions and 4 deletions
  1. 2
    1
      app/helpers/my_helper.rb
  2. 1
    3
      app/views/my/blocks/_issue_query_selection.html.erb

+ 2
- 1
app/helpers/my_helper.rb View File

@@ -132,7 +132,8 @@ module MyHelper
issues = query.issues(:limit => 10)
render :partial => 'my/blocks/issues', :locals => {:query => query, :issues => issues, :block => block, :settings => settings}
else
render :partial => 'my/blocks/issue_query_selection', :locals => {:block => block, :settings => settings}
queries = IssueQuery.visible.sorted
render :partial => 'my/blocks/issue_query_selection', :locals => {:queries => queries, :block => block, :settings => settings}
end
end


+ 1
- 3
app/views/my/blocks/_issue_query_selection.html.erb View File

@@ -1,5 +1,3 @@
<% visible_queries = IssueQuery.visible.sorted %>

<h3>
<%= l(:label_issue_plural) %>
</h3>
@@ -10,7 +8,7 @@
<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]) %>
<%= select_tag "settings[#{block}][query_id]", content_tag("option") + options_from_collection_for_select(queries, :id, :name, settings[:query_id]) %>
</label>
</p>
</div>

Loading…
Cancel
Save