fix Manifest

[pettanr/pettanr.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 965623a..9866d9c 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  layout :devise_layout if MagicNumber['test_layout']
+  layout :devise_layout
   before_filter :bf
   
   def devise_layout
@@ -101,11 +101,11 @@ class ApplicationController < ActionController::Base
   end
   
   def self.controller
-    Pettanr::Application::manifest.controller_managers[self.model.item_name]
+    Manifest.manifest.controller_managers[self.model.item_name]
   end
   
   def self.profiler_manager
-    Pettanr::Application::manifest.profiler_managers[self.model.item_name]
+    Manifest.manifest.profiler_managers[self.model.item_name]
   end
   
   def public_list 
@@ -128,7 +128,7 @@ class ApplicationController < ActionController::Base
   def my_list params
     controller_name = params[:controller]
     action_name = params[:action]
-    controller = Pettanr::Application::manifest.controller_managers[controller_name]
+    controller = Manifest.manifest.controller_managers[controller_name]
     @action = controller.open(action_name, params, @operators)
     @items = @action.items 
 
@@ -147,13 +147,13 @@ class ApplicationController < ActionController::Base
     @parent_item = self.class.model.show(params[:id], @operators)
     controller_name = self.class.model.item_name
     action_name = params[:action]
-    controller = Pettanr::Application::manifest.controller_managers[controller_name]
+    controller = Manifest.manifest.controller_managers[controller_name]
     @action = controller.open(action_name, params, @operators)
     many_name = @action.list.association_model_name
     @items = @action.list.items @parent_item
     respond_to do |format|
       format.html {
-        @filer =  Pettanr::Application::manifest.filer_managers[many_name].open(many_name, @items, @operators, @action.list.paginate(@parent_item))
+        @filer =  Manifest.manifest.filer_managers[many_name].open(many_name, @items, @operators, @action.list.paginate(@parent_item))
         render :template => 'system/filer', :locals => {
           :filer => @filer
         }
@@ -165,14 +165,14 @@ class ApplicationController < ActionController::Base
   def filter_list
     controller_name = self.class.model.item_name
     action_name = params[:action]
-    controller = Pettanr::Application::manifest.controller_managers[controller_name]
+    controller = Manifest.manifest.controller_managers[controller_name]
     @action = controller.open(action_name, params, @operators)
     @filter_item = @action.list.from_model.show(params[:id], @operators)
     item_model_name = @action.list.item_name
     @items = @action.list.items @filter_item
     respond_to do |format|
       format.html {
-        @filer =  Pettanr::Application::manifest.filer_managers[item_model_name].open(item_model_name, @items, @operators, @action.list.paginate(@filter_item))
+        @filer =  Manifest.manifest.filer_managers[item_model_name].open(item_model_name, @items, @operators, @action.list.paginate(@filter_item))
         render :template => 'system/filer', :locals => {
           :filer => @filer
         }