From ad2df4a792e70bc4180c8469941a90ae3ab4facd Mon Sep 17 00:00:00 2001 From: sf Date: Tue, 27 Sep 2011 17:33:32 -0400 Subject: [PATCH 1/2] fixed routing problem --- app/controllers/projects_controller.rb | 5 +---- app/views/projects/_project_form.rhtml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 821d1f79..3fd53e75 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -42,10 +42,7 @@ class ProjectsController < ApplicationController ## select project that are stalled @blocked_projects = current_user.projects.select {|p| p.blocked?} - - - - + @contexts = current_user.contexts.all init_not_done_counts(['project']) init_project_hidden_todo_counts(['project']) diff --git a/app/views/projects/_project_form.rhtml b/app/views/projects/_project_form.rhtml index 46630cff..7ccdc295 100644 --- a/app/views/projects/_project_form.rhtml +++ b/app/views/projects/_project_form.rhtml @@ -40,7 +40,7 @@ project = project_form <%=image_tag("cancel.png", :alt => "") %> Cancel - " id="<%= dom_id(project, 'reviewed') %>" class="reviewed"> + " id="<%= dom_id(project, 'reviewed') %>" class="reviewed"> <%=image_tag("reviewed.png", :alt => "") %> Reviewed From 858be5d85b328ec0e1094c48342e8d6da3d5d122 Mon Sep 17 00:00:00 2001 From: sf Date: Tue, 27 Sep 2011 19:22:14 -0400 Subject: [PATCH 2/2] added preferences description, added list of up-to-date projects to review view --- app/controllers/projects_controller.rb | 5 ++++- app/views/projects/_project_state_group.rhtml | 2 +- app/views/projects/review.html.erb | 1 + config/locales/en.yml | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3fd53e75..3e991bf6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -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 diff --git a/app/views/projects/_project_state_group.rhtml b/app/views/projects/_project_state_group.rhtml index 65e15230..f37cb9fc 100644 --- a/app/views/projects/_project_state_group.rhtml +++ b/app/views/projects/_project_state_group.rhtml @@ -6,7 +6,7 @@

<%= project_state_group.length%><%= total_count_string%> - <%= 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)+")"%> diff --git a/app/views/projects/review.html.erb b/app/views/projects/review.html.erb index 201e792d..ac6dc1ef 100644 --- a/app/views/projects/review.html.erb +++ b/app/views/projects/review.html.erb @@ -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'} %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 42f0411f..3c908e1d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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