From 2f0bfbbf4709513a613d13d791b0e9a0b8d1aafd Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Wed, 28 Sep 2011 15:34:15 +0200
Subject: [PATCH] some smallfurther adjustments

---
 app/controllers/projects_controller.rb | 2 +-
 app/models/project.rb                  | 6 +++---
 app/views/projects/_project_form.rhtml | 2 +-
 config/routes.rb                       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 306dd47b..fbceb362 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -40,7 +40,7 @@ class ProjectsController < ApplicationController
     @projects_to_review = current_user.projects.select  {|p| p.needs_review?(current_user)}
     @stalled_projects = current_user.projects.select  {|p| p.stalled?}
     @blocked_projects = current_user.projects.select  {|p| p.blocked?}
-    @current_projects = current_user.projects.select  {|p| not(p.needs_review?(current_user))}
+    @current_projects = current_user.projects.uncompleted.select  {|p| not(p.needs_review?(current_user))}
 
     init_not_done_counts(['project'])
     init_project_hidden_todo_counts(['project'])
diff --git a/app/models/project.rb b/app/models/project.rb
index 8b507207..9d26a26e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -115,14 +115,14 @@ class Project < ActiveRecord::Base
   def blocked?
     ## mutually exclusive for stalled and blocked
     # blocked is uncompleted project with deferred or pending todos, but no next actions
-    return false if self.stalled? || self.completed?
-    return !self.todos.deferred_or_blocked.empty?
+    return false if self.completed?
+    return !self.todos.deferred_or_blocked.empty? && self.todos.not_deferred_or_blocked.empty?
   end
 
   def stalled?
     # stalled is active/hidden project with no active todos
     return false if self.completed?
-    return self.todos.not_completed.empty?
+    return self.todos.deferred_or_blocked.empty? && self.todos.not_deferred_or_blocked.empty?
   end
 
 
diff --git a/app/views/projects/_project_form.rhtml b/app/views/projects/_project_form.rhtml
index 7ccdc295..8aa86ee1 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
       </a>
-      <a href="/projects/<%=project.id.to_s+"/set_reviewed"%>" id="<%= dom_id(project, 'reviewed') %>" class="reviewed">
+      <a href="<%=set_reviewed_project_path(project)%>" id="<%= dom_id(project, 'reviewed') %>" class="reviewed">
         <%=image_tag("reviewed.png", :alt => "") %>
         Reviewed
       </a>
diff --git a/config/routes.rb b/config/routes.rb
index 43a833d1..959b7491 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,7 +14,7 @@ ActionController::Routing::Routes.draw do |map|
 
   map.resources :projects,
     :collection => {:order => :post, :alphabetize => :post, :actionize => :post, :done => :get},
-    :member => {:done_todos => :get, :all_done_todos => :get, :set_reviewed => :post} do |projects|
+    :member => {:done_todos => :get, :all_done_todos => :get, :set_reviewed => :get} do |projects|
       projects.resources :todos, :name_prefix => "project_"
   end