Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-24 03:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #24 from Popsch/fix_review_bug

Browse source 
fixed routing problem in the review mode
This commit is contained in:
Reinier Balt 2011-09-28 04:48:30 -07:00
commit 7f10c7b963
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/projects_controller.rb
View file

@ -43,9 +43,9 @@ class ProjectsController < ApplicationController
## select project that are stalled
@blocked_projects = current_user.projects.select {|p| p.blocked?}
## select projects that are current
@current_projects = current_user.projects.select {|p| not(p.needs_review?(current_user))}
@contexts = current_user.contexts.all
init_not_done_counts(['project'])
init_project_hidden_todo_counts(['project'])
@ -56,7 +56,7 @@ class ProjectsController < ApplicationController
end
@page_title = t('projects.list_reviews')
@count = @projects_to_review.count + @blocked_projects.count + @stalled_projects.count
@count = @projects_to_review.count + @blocked_projects.count + @stalled_projects.count + @current_projects.count
@no_projects = current_user.projects.empty?
current_user.projects.cache_note_counts

2
app/views/projects/_project_form.rhtml
View file

@ -40,7 +40,7 @@ project = project_form
<%=image_tag("cancel.png", :alt => "") %>
Cancel
</a>
<a href="<%=project.id.to_s+"/set_reviewed"%>" id="<%= dom_id(project, 'reviewed') %>" class="reviewed">
<a href="/projects/<%=project.id.to_s+"/set_reviewed"%>" id="<%= dom_id(project, 'reviewed') %>" class="reviewed">
<%=image_tag("reviewed.png", :alt => "") %>
Reviewed
</a>

2
app/views/projects/_project_state_group.rhtml
View file

@ -6,7 +6,7 @@
<h2>
<span id="<%= state %>-projects-count" class="badge"><%= project_state_group.length%><%= total_count_string%></span>
<%= t('common.last' ) unless (state == 'review' || state == 'stalled' || state == 'blocked')%>
<%= t('common.last' ) unless (state == 'review' || state == 'stalled' || state == 'blocked' || state == 'current')%>
<%= t('states.'+state+'_plural' )%>
<%= t('common.projects') %><%= total_count==-1 ? "" : " ("+link_to("Show all", done_projects_path)+")"%>

1
app/views/projects/review.html.erb
View file

@ -4,3 +4,4 @@
<%= render :partial => 'project_state_group', :object => @projects_to_review, :locals => { :state => 'review'} %>
<%= render :partial => 'project_state_group', :object => @stalled_projects, :locals => { :state => 'stalled'} %>
<%= render :partial => 'project_state_group', :object => @blocked_projects, :locals => { :state => 'blocked'} %>
<%= render :partial => 'project_state_group', :object => @current_projects, :locals => { :state => 'current'} %>

3
config/locales/en.yml
View file

@ -182,6 +182,7 @@ en:
mobile_todos_per_page: Actions per page (Mobile View)
verbose_action_descriptors: Verbose action descriptors
staleness_starts: Start of staleness
review_period: Project review interval
sms_context: Default email context
title_date_format: Title date format
show_number_completed: Show number of completed actions
@ -587,6 +588,8 @@ en:
stalled: Stalled
blocked_plural: Blocked
blocked: Blocked
current_plural: Up-to-date
current: Up-to-date
projects:
was_marked_hidden: has been marked as hidden
edit_project_title: Edit project