From 2ce7476f661d46f7b03c4b52531a49ca313468e9 Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Fri, 9 Nov 2007 21:08:24 +0000
Subject: [PATCH] ActionItem114: making CMS working again

---
 app/controllers/profile_admin/cms_controller.rb | 11 +++--------
 config/environment.rb                           |  6 ------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/controllers/profile_admin/cms_controller.rb b/app/controllers/profile_admin/cms_controller.rb
index ab03ef2..26ebf1e 100644
--- a/app/controllers/profile_admin/cms_controller.rb
+++ b/app/controllers/profile_admin/cms_controller.rb
@@ -1,6 +1,4 @@
 class CmsController < ProfileAdminController
-  include PermissionCheck
-  include AuthenticatedSystem
   
   define_option :page_class, Article
   
@@ -16,17 +14,14 @@ class CmsController < ProfileAdminController
     current_user.person
   end
 
+  public
+
   #############################################################
   # everything below was copied from comatose
   #############################################################
 
   define_option :original_template_root, nil
   define_option :plugin_layout_path, File.join( '..', '..', '..', 'vendor', 'plugins', 'comatose', 'views', 'layouts' )
-
-  # which class should the controller use when manipulating pages?
-  # this option is useful to applications that want to inherit page_class
-  # into their own models.
-  define_option :page_class, Comatose::Page
   
   before_filter :handle_authorization
   before_filter :set_content_type
@@ -163,7 +158,7 @@ class CmsController < ProfileAdminController
   end
 
   
-  otected
+  protected
 
   def handle_authorization
     if Comatose.config.admin_authorization.is_a? Proc
diff --git a/config/environment.rb b/config/environment.rb
index 114006f..628f869 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -83,12 +83,6 @@ Comatose.configure do |config|
     Profile.exists?(:identifier => request.parameters[:profile])
     # FIXME: also check permissions
   end
-  config.admin_includes << AuthenticatedSystem
-  config.admin_includes << NeedsProfile
-
-  config.admin_helpers << ApplicationHelper
-  config.admin_helpers << DocumentHelper
-  config.admin_helpers << LanguageHelper
 
   config.default_filter = '[No Filter]'
 end
--
libgit2 0.21.2