From 5f0bcebca968f56f8227cf039efca3a823d97d39 Mon Sep 17 00:00:00 2001 From: sfischme Date: Fri, 16 Sep 2011 15:07:58 -0400 Subject: [PATCH] first steps towards review view --- app/controllers/projects_controller.rb | 4 ++++ app/helpers/projects_helper.rb | 2 +- app/models/project.rb | 5 +++++ app/views/projects/_project_state_group.rhtml | 2 +- config/routes.rb | 6 ++++++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 51f7eae5..7856235b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -33,6 +33,10 @@ class ProjectsController < ApplicationController end end + def review + puts "MUAUAUAUAUAUAUAUA" + end + def done @source_view = params['_source_view'] || 'project_list' @page_title = t('projects.list_completed_projects') diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 1d383fd5..f0171d11 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -69,7 +69,7 @@ module ProjectsHelper def needsreview_class(item) ### FIXME: need to check to do this with active projects only - if item.last_reviewed < current_user.time - (prefs.review_period).days + if item.needs_review?(current_user) return "needsreview" else return "needsnoreview" diff --git a/app/models/project.rb b/app/models/project.rb index c78e6ccb..7a3730ab 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -107,6 +107,11 @@ class Project < ActiveRecord::Base end end + def needs_review?(current_user) + return (last_reviewed < current_user.time ) # - current_user.prefs.review_period.days) + end + + def name=(value) self[:name] = value.gsub(/\s{2,}/, " ").strip end diff --git a/app/views/projects/_project_state_group.rhtml b/app/views/projects/_project_state_group.rhtml index beb7d882..68b03240 100644 --- a/app/views/projects/_project_state_group.rhtml +++ b/app/views/projects/_project_state_group.rhtml @@ -18,6 +18,6 @@
- <%= render :partial => 'project_listing', :collection => project_state_group %> + <%= render :partial => 'projects/project_listing', :collection => project_state_group %>
diff --git a/config/routes.rb b/config/routes.rb index 98307766..c642eb35 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,6 +17,11 @@ ActionController::Routing::Routes.draw do |map| projects.resources :todos, :name_prefix => "project_" end + map.with_options :controller => :projects do |projects| + # projects.home '', :action => "index" + projects.review 'review', :action => :review + end + map.resources :notes map.resources :todos, @@ -24,6 +29,7 @@ ActionController::Routing::Routes.draw do |map| :collection => {:check_deferred => :post, :filter_to_context => :post, :filter_to_project => :post, :done => :get, :all_done => :get } + map.with_options :controller => :todos do |todos| todos.home '', :action => "index" todos.tickler 'tickler.:format', :action => "list_deferred"