From f71c6bbd8d540fd1685b2067d400aa771de502dd Mon Sep 17 00:00:00 2001 From: Pat Nakajima Date: Sat, 7 Feb 2009 23:33:33 -0500 Subject: [PATCH] Fixed Application -> ApplicationController --- app/controllers/admin/posts_controller.rb | 2 +- app/controllers/{application.rb => application_controller.rb} | 2 +- app/controllers/comments_controller.rb | 2 +- app/controllers/feeds_controller.rb | 2 +- app/controllers/posts_controller.rb | 2 +- app/controllers/sessions_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename app/controllers/{application.rb => application_controller.rb} (95%) diff --git a/app/controllers/admin/posts_controller.rb b/app/controllers/admin/posts_controller.rb index c392cdf..2467439 100644 --- a/app/controllers/admin/posts_controller.rb +++ b/app/controllers/admin/posts_controller.rb @@ -1,4 +1,4 @@ -class Admin::PostsController < Application +class Admin::PostsController < ApplicationController rescue_from ActiveRecord::RecordNotFound, :with => :not_found before_filter :login_required diff --git a/app/controllers/application.rb b/app/controllers/application_controller.rb similarity index 95% rename from app/controllers/application.rb rename to app/controllers/application_controller.rb index 9d01982..a374d91 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application_controller.rb @@ -1,7 +1,7 @@ # Filters added to this controller apply to all controllers in the application. # Likewise, all the methods added will be available for all controllers. -class Application < ActionController::Base +class ApplicationController < ActionController::Base include AuthenticatedSystem protect_from_forgery diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 77b669d..d58f82d 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -1,4 +1,4 @@ -class CommentsController < Application +class CommentsController < ApplicationController before_filter :login_required, :only => [:update, :destroy] before_filter :get_commentable # skip_before_filter :verify_authenticity_token, :only => :update diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb index 2ebf245..aff4a38 100644 --- a/app/controllers/feeds_controller.rb +++ b/app/controllers/feeds_controller.rb @@ -1,4 +1,4 @@ -class FeedsController < Application +class FeedsController < ApplicationController before_filter :login_required diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index db8ba5b..47e4e11 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -1,4 +1,4 @@ -class PostsController < Application +class PostsController < ApplicationController # Used by feeds_controller to calculate cache expirations. @@subtypes = [:articles, :links, :pictures, :quotes, :snippets, :tweets, :gists] diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 9d58e60..465ced6 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # This controller handles the login/logout function of the site. -class SessionsController < Application +class SessionsController < ApplicationController # render new.rhtml def new diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b08a7c9..7b5efa4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,4 @@ -class UsersController < Application +class UsersController < ApplicationController # render new.rhtml def new redirect_to root_path if (User.count >= 1) && !logged_in?