Skip to content

Commit

Permalink
Updating Screenshots
Browse files Browse the repository at this point in the history
  • Loading branch information
jcnetdev committed Oct 1, 2008
1 parent c7193cc commit bb0f19e
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion app/controllers/screenshots_controller.rb
Expand Up @@ -43,7 +43,6 @@ def create
@invalid_screenshots.each{|screenshot| set_flash(screenshot) } @invalid_screenshots.each{|screenshot| set_flash(screenshot) }
redirect_to project_url(@project)+"#screenshots_add" redirect_to project_url(@project)+"#screenshots_add"
end end

end end


def destroy def destroy
Expand Down
14 changes: 7 additions & 7 deletions lib/authenticated_system.rb
@@ -1,9 +1,15 @@
module AuthenticatedSystem module AuthenticatedSystem
protected 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. # Returns true or false if the user is logged in.
# Preloads @current_user with the user model if they're logged in. # Preloads @current_user with the user model if they're logged in.
def logged_in? def logged_in?
current_user != :false current_user.is_a? User
end end


def current_or_anon_user def current_or_anon_user
Expand Down Expand Up @@ -104,12 +110,6 @@ def redirect_back_or_default(default)
session[:return_to] = nil session[:return_to] = nil
end 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. # Called from #current_user. First attempt to login by the user id stored in the session.
def login_from_session def login_from_session
self.current_user = User.find(session[:user_id]) if session[:user_id] self.current_user = User.find(session[:user_id]) if session[:user_id]
Expand Down
Binary file removed public/images/default_preview.png
Binary file not shown.
Binary file removed public/images/default_screenshot.png
Binary file not shown.
Binary file modified public/images/default_screenshots/medium.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/default_screenshots/original.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/default_screenshots/thumb.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/default_thumb.png
Binary file not shown.

0 comments on commit bb0f19e

Please sign in to comment.