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 @@