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

added preferences description, added list of up-to-date projects to review view

Browse source
This commit is contained in:
sf 2011-09-27 19:22:14 -04:00
parent ad2df4a792
commit 858be5d85b
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/projects_controller.rb
View file

@ -42,6 +42,9 @@ class ProjectsController < ApplicationController
## select project that are stalled ## select project that are stalled
@blocked_projects = current_user.projects.select {|p| p.blocked?} @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 @contexts = current_user.contexts.all
init_not_done_counts(['project']) init_not_done_counts(['project'])
@ -53,7 +56,7 @@ class ProjectsController < ApplicationController
end end
@page_title = t('projects.list_reviews') @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? @no_projects = current_user.projects.empty?
current_user.projects.cache_note_counts current_user.projects.cache_note_counts

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

@ -6,7 +6,7 @@
<h2> <h2>
<span id="<%= state %>-projects-count" class="badge"><%= project_state_group.length%><%= total_count_string%></span> <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('states.'+state+'_plural' )%>
<%= t('common.projects') %><%= total_count==-1 ? "" : " ("+link_to("Show all", done_projects_path)+")"%> <%= 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 => @projects_to_review, :locals => { :state => 'review'} %>
<%= render :partial => 'project_state_group', :object => @stalled_projects, :locals => { :state => 'stalled'} %> <%= 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 => @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) mobile_todos_per_page: Actions per page (Mobile View)
verbose_action_descriptors: Verbose action descriptors verbose_action_descriptors: Verbose action descriptors
staleness_starts: Start of staleness staleness_starts: Start of staleness
review_period: Project review interval
sms_context: Default email context sms_context: Default email context
title_date_format: Title date format title_date_format: Title date format
show_number_completed: Show number of completed actions show_number_completed: Show number of completed actions
@ -587,6 +588,8 @@ en:
stalled: Stalled stalled: Stalled
blocked_plural: Blocked blocked_plural: Blocked
blocked: Blocked blocked: Blocked
current_plural: Up-to-date
current: Up-to-date
projects: projects:
was_marked_hidden: has been marked as hidden was_marked_hidden: has been marked as hidden
edit_project_title: Edit project edit_project_title: Edit project