X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fsystem_controller.rb;h=be48d475f0aa8e2a69dd93df723e1d914dd55b5b;hb=674d4fb2e72c2e1653b13d026af884559fd9eb4e;hp=ed74a00f046e455d1c5e233ff4aaa77d28513892;hpb=32011a831d9b226af0ee586c91ca5c5225048976;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/system_controller.rb b/app/controllers/system_controller.rb
index ed74a00f..be48d475 100644
--- a/app/controllers/system_controller.rb
+++ b/app/controllers/system_controller.rb
@@ -13,16 +13,17 @@ class SystemController < ApplicationController
   end
   
   def reload_manifest
-    Pettanr::Application.manifest = Pettanr::Manifest.new JSON.parse(open(Rails.root + 'public/manifest.json').read)
-    Pettanr::Application.manifest.init
+    Manifest::load JSON.parse(open(Rails.root + 'public/manifest.json').read)
+    Manifest.manifest.init
+    LocalManifest::load JSON.parse(open(Rails.root + 'public/local_manifest.json').read)
+    LocalManifest.manifest.init
+    Manifest.manifest.init_after_load_manifest
+    Manifest.manifest.load_models_manifest
     respond_to do |format|
       format.html { redirect_to({:action => :index}) }
     end
   end
   
-  def browse
-  end
-  
   def auth_token
   end
   
@@ -75,18 +76,4 @@ class SystemController < ApplicationController
     end
   end
   
-  def production_layout
-    MagicNumber['test_layout'] = false
-    respond_to do |format|
-      format.html { render text: 'production', status: 200 }
-    end
-  end
-  
-  def test_layout
-    MagicNumber['test_layout'] = 'test'
-    respond_to do |format|
-      format.html { render text: 'test', status: 200 }
-    end
-  end
-  
 end