X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fsystem_controller.rb;h=f5f8d95697f99e0fa3e565197744f880312e17ac;hb=6a9125ccbacea489311fc4cc548ac03e7d0b412d;hp=fe79ea260e0a047344f4cf73014dc065e5096f87;hpb=58131ea653245c01cefb9008245db5e76a488086;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/system_controller.rb b/app/controllers/system_controller.rb
index fe79ea26..f5f8d956 100644
--- a/app/controllers/system_controller.rb
+++ b/app/controllers/system_controller.rb
@@ -1,5 +1,5 @@
 class SystemController < ApplicationController
-  before_filter :authenticate_admin!, :except => [:start]
+  before_action :authenticate_admin!, :except => [:start]
   
   #layout :system
   
@@ -15,14 +15,15 @@ class SystemController < ApplicationController
   def reload_manifest
     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
   
@@ -63,7 +64,7 @@ class SystemController < ApplicationController
   end
   
   def waiting_list
-    @waits = Admin.find(:all, :conditions => ['approve = 0'])
+    @waits = Admin.where(approve: 0)
   end
   
   def accept_admin
@@ -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