X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fsystem_controller.rb;h=be48d475f0aa8e2a69dd93df723e1d914dd55b5b;hb=665761e56525215946e2547a70c82c603d5047af;hp=20ac6e410cd446d44c54cb642b0cc957a885e61f;hpb=c2af7cf1ff49dcf8f3c902a718d6842793af4f39;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/system_controller.rb b/app/controllers/system_controller.rb
index 20ac6e41..be48d475 100644
--- a/app/controllers/system_controller.rb
+++ b/app/controllers/system_controller.rb
@@ -9,7 +9,19 @@ class SystemController < ApplicationController
   def index
   end
   
-  def browse
+  def import
+  end
+  
+  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 auth_token
@@ -19,17 +31,24 @@ class SystemController < ApplicationController
     @admin = current_admin
     respond_to do |format|
       if @admin.create_token
-        format.html { redirect_to({:action => :auth_token}, {:notice => 'admin token was successfully created.'}) }
+        flash[:notice] = I18n.t('flash.notice.created', :model => Admin.human_attribute_name(:authentication_token))
+        format.html { redirect_to({:action => :auth_token}) }
       else
+        flash[:notice] = I18n.t('flash.notice.not_created', :model => Admin.human_attribute_name(:authentication_token))
         format.html { render action: "auth_token" }
       end
     end
   end
   
   def delete_token
-    current_admin.delete_token
     respond_to do |format|
-      format.html { redirect_to :action => :auth_token}
+      if current_admin.delete_token
+        flash[:notice] = I18n.t('flash.notice.destroyed', :model => Admin.human_attribute_name(:authentication_token))
+        format.html { redirect_to :action => :auth_token}
+      else
+        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Admin.human_attribute_name(:authentication_token))
+        format.html { render action: "auth_token" }
+      end
     end
   end
   
@@ -57,18 +76,4 @@ class SystemController < ApplicationController
     end
   end
   
-  def production_layout
-    Pettanr::Application.test_layout = false
-    respond_to do |format|
-      format.html { render text: 'production', status: 200 }
-    end
-  end
-  
-  def test_layout
-    Pettanr::Application.test_layout = 'test'
-    respond_to do |format|
-      format.html { render text: 'test', status: 200 }
-    end
-  end
-  
 end