Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-22 16:56:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix #827. You can now select todos with tags using OR and AND

Browse source 
/todos/tag/tagA,tagB?and=tagC will select all todos with (tagA or tagB) AND tagC
This commit is contained in:
Reinier Balt 2011-10-28 19:33:51 +02:00
parent 2accbd0a32
commit 58d8bc56d1
9 changed files with 255 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/todos/mobile_tag.rhtml
View file

@ -2,24 +2,24 @@
<% if @not_done_todos.empty? -%>
<div class="container context">
<h2><%= t('todos.no_actions_found_title') %></h2>
<div class="message"><%= t('todos.no_actions_with', :tag_name => @tag_name) %></div>
<div class="message"><%= t('todos.no_actions_with', :tag_name => @tag_title) %></div>
</div>
<% end -%>
<%= render :partial => "contexts/mobile_context", :collection => @contexts_to_show -%>
<h2><%= t('todos.deferred_actions_with', :tag_name=> @tag_name) %></h2>
<h2><%= t('todos.deferred_actions_with', :tag_name=> @tag_title) %></h2>
<% unless (@deferred.nil? or @deferred.size == 0) -%>
<table cellpadding="0" cellspacing="0" border="0">
<%= render :partial => "todos/mobile_todo", :collection => @deferred, :locals => { :parent_container_type => "tag" } -%>
</table>
</table>
<% else -%>
<%= t('todos.no_deferred_actions_with', :tag_name => @tag_name) %>
<%= t('todos.no_deferred_actions_with', :tag_name => @tag_title) %>
<% end -%>
<h2><%= t('todos.completed_actions_with', :tag_name => @tag_name) %></h2>
<h2><%= t('todos.completed_actions_with', :tag_name => @tag_title) %></h2>
<% unless (@done.nil? or @done.size == 0) -%>
<table cellpadding="0" cellspacing="0" border="0">
<%= render :partial => "todos/mobile_todo", :collection => @done, :locals => { :parent_container_type => "tag" } %>
</table>
<% else -%>
<%= t('todos.no_completed_actions_with', :tag_name => @tag_name) %>
<%= t('todos.no_completed_actions_with', :tag_name => @tag_title) %>
<% end -%>
</div>

14
app/views/todos/tag.html.erb
View file

@ -8,22 +8,22 @@
:locals => { :collapsible => true } %>
<% unless @deferred.nil? -%>
<%= render :partial => "todos/deferred", :locals => {
:deferred => @deferred,
<%= render :partial => "todos/deferred", :locals => {
:deferred => @deferred,
:pending => @pending,
:collapsible => true,
:append_descriptor => t('todos.tagged_with', :tag_name => @tag_name),
:parent_container_type => 'tag'
:collapsible => true,
:append_descriptor => t('todos.tagged_with', :tag_name => @tag_title),
:parent_container_type => 'tag'
} %>
<% end -%>
<% unless @hidden_todos.nil? -%>
<%= render :partial => "todos/hidden", :object => @hidden_todos, :locals => { :collapsible => true, :append_descriptor => t('todos.tagged_with', :tag_name => @tag_name) } %>
<%= render :partial => "todos/hidden", :object => @hidden_todos, :locals => { :collapsible => true, :append_descriptor => t('todos.tagged_with', :tag_name => @tag_title) } %>
<% end -%>
<% unless @done.nil? -%>
<%= render :partial => "todos/completed", :object => @done,
:locals => { :collapsible => true, :append_descriptor => t('todos.tagged_with', :tag_name => @tag_name) } %>
:locals => { :collapsible => true, :append_descriptor => t('todos.tagged_with', :tag_name => @tag_title) } %>
<% end -%>
</div><!-- End of display_box -->