From: yasushiito <yas@pen-chan.jp>
Date: Wed, 7 Nov 2012 07:57:59 +0000 (+0900)
Subject: t#29325:add server result
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=16bdf03a3e2bb03fe97a04a87b4d97bfe201ffc4

t#29325:add server result
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b7496a23..4ba05aeb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,10 @@ class ApplicationController < ActionController::Base
   before_filter :bf
   
   def bf
+    @server_result = {
+      :location => {:controller => params[:controller], :action => params[:action]}
+    }
+    @server_result[:location][:id] = params[:id] if params[:id]
     if Admin.count.to_i == 0 or License.count.to_i == 0
       if params[:controller] == 'system' and params[:action] == 'start'
       else
diff --git a/app/views/comics/edit.html.erb b/app/views/comics/edit.html.erb
index e2e20328..2b9cb6cf 100644
--- a/app/views/comics/edit.html.erb
+++ b/app/views/comics/edit.html.erb
@@ -1,7 +1,4 @@
 <h1>edit comic</h1>
 
 <%= render 'form' %>
-<script>
-var r=<%= @comic.to_json %>;
-</script>
 <%= link_to 'Back', comics_path %>
diff --git a/app/views/comics/new.html.erb b/app/views/comics/new.html.erb
index c196a28c..00a4e2a6 100644
--- a/app/views/comics/new.html.erb
+++ b/app/views/comics/new.html.erb
@@ -1,6 +1,5 @@
 <h1>New comic</h1>
 
 <%= render 'form' %>
-<%= javascript_tag 'var r=' + @comic.errors.to_json + ';' %>
 
 <%= link_to 'Back', comics_path %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b363ebdc..5d5dcd9f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -17,6 +17,7 @@
 		</div>
 		<div id="esc-msg" style="border:1px red solid;padding:10px;margin:10px;cursor:pointer;">[ESC] キーを押すと Metro ホームに入るよ．ホームの一番最後のタイルをクリックすると このページに戻るよ．</div>
 		<div id="server-page-close-button" class="button" style="width:100px;margin:1em;">ホームへ</div>
+   <%= javascript_tag 'var server_result=' + @server_result.to_json + ';' %>
 		<%= javascript_include_tag "jquery-1.6.2.min" %>
 		<%= javascript_include_tag "system" %>
 		<% if current_user %>
diff --git a/app/views/layouts/test.html.erb b/app/views/layouts/test.html.erb
index a0e3870f..110c475c 100644
--- a/app/views/layouts/test.html.erb
+++ b/app/views/layouts/test.html.erb
@@ -52,8 +52,7 @@
 <%= link_to 'system_pictures', main_app.system_pictures_path %>
 </div>
 <%= yield %>
-<%= params[:controller] %>
-<%= params[:action] %>
+<%= javascript_tag 'var server_result=' + @server_result.to_json + ';' %>
 
 </body>
 </html>