diff --git a/tracks/app/models/project.rb b/tracks/app/models/project.rb index 5b68eefd..61e6daa4 100644 --- a/tracks/app/models/project.rb +++ b/tracks/app/models/project.rb @@ -21,11 +21,11 @@ class Project < ActiveRecord::Base state :completed event :activate do - transitions :to => :active, :from => [:hidden, :complete] + transitions :to => :active, :from => [:hidden, :completed] end event :hide do - transitions :to => :hidden, :from => [:active, :complete] + transitions :to => :hidden, :from => [:active, :completed] end event :complete do diff --git a/tracks/config/routes.rb b/tracks/config/routes.rb index 90140c0c..5b80a2ff 100644 --- a/tracks/config/routes.rb +++ b/tracks/config/routes.rb @@ -19,7 +19,6 @@ ActionController::Routing::Routes.draw do |map| # Admin Routes map.connect 'admin', :controller => 'admin', :action => 'index' - # map.connect 'admin/signup', :controller => 'admin', :action => 'create' map.connect 'admin/destroy/:id', :controller => 'admin', :action => 'destroy', :requirements => {:id => /\d+/} # Mobile/lite version