close #15 back/cancel ボタンは直近の show/index へのリンク (含 query_string) となるようにした

Author: kuboon

app/controllers/application_controller.rb

@@ -7,6 +7,7 @@ class ApplicationController < ActionController::Base
   respond_to :html
 
   before_action :log_user_info
+  before_action :set_location_to_back
 
   # returns current +User+ if logged in
   # * *Returns* :
@@ -21,4 +22,9 @@ def current_user
   def log_user_info
     logger.info "  user_id: #{session[:user_id]}, request_ip: #{request.ip}, session_id: #{session.id}" if session[:user_id]
   end
+
+  def set_location_to_back
+    session[:location_to_back] = session[:last_location]
+    session[:last_location] = request.fullpath if %w(index show).include?(action_name)
+  end
 end

app/helpers/application_helper.rb

@@ -3,4 +3,8 @@ module ApplicationHelper
   def shallow_args(parent, child)
     child.try(:new_record?) ? [parent, child] : child
   end
+
+  def link_to_back(*args)
+    link_to args.shift, session[:location_to_back] || root_path, *args
+  end
 end

app/views/comments/_form.html.haml

@@ -6,4 +6,4 @@
 
   .form-actions
     = f.button :submit, class: "btn btn-primary"
-    = link_to t('.cancel', :default => t("helpers.links.cancel")), :back, :class => 'btn'
+    = link_to_back t('.cancel', :default => t("helpers.links.cancel")), :class => 'btn'

app/views/posts/_form.html.haml

@@ -7,4 +7,4 @@
 
   .form-actions
     = f.button :submit, class: "btn btn-primary"
-    = link_to t('.cancel', :default => t("helpers.links.cancel")), :back, :class => 'btn'
+    = link_to_back t('.cancel', :default => t("helpers.links.cancel")), :class => 'btn'

app/views/posts/show.html.haml

@@ -11,7 +11,7 @@
   %dd= link_to @post.url, @post.url
 
 .form-actions
-  = link_to t('.back', :default => t("helpers.links.back")), :back, :class => 'btn'
+  = link_to_back t('.back', :default => t("helpers.links.back")), :class => 'btn'
   = link_to t('.edit', :default => t("helpers.links.edit")), edit_post_path(@post), :class => 'btn' if can? :update, @post
   = link_to t('.destroy', :default => t("helpers.links.destroy")), post_path(@post), :method => "delete", :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-danger' if can? :destroy, @post
 

app/views/users/_form.html.haml

@@ -9,4 +9,4 @@
 
   .form-actions
     = f.button :submit, class: "btn btn-primary"
-    = link_to t('.cancel', :default => t("helpers.links.cancel")), :back, :class => 'btn'
+    = link_to_back t('.cancel', :default => t("helpers.links.cancel")), :class => 'btn'

app/views/users/show.html.haml

@@ -3,7 +3,7 @@
   %h1= @user.username
 
 .form-actions
-  = link_to t('.back', :default => t("helpers.links.back")), :back, :class => 'btn'
+  = link_to_back t('.back', :default => t("helpers.links.back")), :class => 'btn'
   = link_to t('.edit', :default => t("helpers.links.edit")), edit_user_path(@user), :class => 'btn' if can? :update, @user
   = link_to t('.destroy', :default => t("helpers.links.destroy")), user_path(@user), :method => "delete", :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) }, :class => 'btn btn-danger' if can? :destroy, @user