@@ -43,7 +43,6 @@ class ScreenshotsController < Base::ProjectSubpage @invalid_screenshots.each{|screenshot| set_flash(screenshot) } redirect_to project_url(@project)+"#screenshots_add" end - end def destroy app/controllers/screenshots_controller.rb @@ -1,9 +1,15 @@ module AuthenticatedSystem protected + # Inclusion hook to make #current_user and #logged_in? + # available as ActionView helper methods. + def self.included(base) + base.send :helper_method, :current_user, :logged_in?, :anon_user, :current_or_anon_user, :admin? + end + # Returns true or false if the user is logged in. # Preloads @current_user with the user model if they're logged in. def logged_in? - current_user != :false + current_user.is_a? User end def current_or_anon_user @@ -104,12 +110,6 @@ module AuthenticatedSystem session[:return_to] = nil end - # Inclusion hook to make #current_user and #logged_in? - # available as ActionView helper methods. - def self.included(base) - base.send :helper_method, :current_user, :logged_in?, :anon_user, :current_or_anon_user, :admin? - end - # Called from #current_user. First attempt to login by the user id stored in the session. def login_from_session self.current_user = User.find(session[:user_id]) if session[:user_id] lib/authenticated_system.rb public/images/default_screenshots/medium.png public/images/default_screenshots/original.png public/images/default_screenshots/thumb.png public/images/default_preview.png public/images/default_screenshot.png public/images/default_thumb.png c7193ccf420a656db0d2a7fd16ceaef5b41098bc Jacques Crocker jcnetdev@gmail.com http://github.com/jcnetdev/opensourcerails/commit/bb0f19e3bde33f09b231e181ad05d0f84fdaed9a bb0f19e3bde33f09b231e181ad05d0f84fdaed9a 2008-10-01T09:05:44-07:00 2008-10-01T09:05:44-07:00 Updating Screenshots c6a0544fa8b02d611d516f6c62e403d9b804f7e8 Jacques Crocker jcnetdev@gmail.com