mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-18 21:28:08 +01:00
added preferences description, added list of up-to-date projects to review view
This commit is contained in:
parent
ad2df4a792
commit
858be5d85b
4 changed files with 9 additions and 2 deletions
|
|
@ -42,6 +42,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'])
|
||||
|
|
@ -53,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
|
||||
|
|
|
|||
|
|
@ -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)+")"%>
|
||||
|
||||
|
|
|
|||
|
|
@ -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'} %>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue