Merge pull request #5158 from tomhughes/vagrant-debian

[rails.git] / app / controllers / traces_controller.rb

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index 5bee44886716448fbcd715dc893c981341b5984b..d723bac5b73b634f62d32e99ae6337f8e41c3916 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -65,6 +65,8 @@ class TracesController < ApplicationController
 
     # final helper vars for view
     @target_user = target_user
 
     # final helper vars for view
     @target_user = target_user

+
+    render :partial => "page" if turbo_frame_request_id == "pagination"

   end
 
   def show
   end
 
   def show


@@ -141,7 +143,7 @@ class TracesController < ApplicationController
       flash[:notice] = t ".updated"
       redirect_to :action => "show", :display_name => current_user.display_name
     else
       flash[:notice] = t ".updated"
       redirect_to :action => "show", :display_name => current_user.display_name
     else

-      @title = t ".title", :name => @trace.name
+      @title = t "traces.edit.title", :name => @trace.name

       render :action => "edit"
     end
   rescue ActiveRecord::RecordNotFound
       render :action => "edit"
     end
   rescue ActiveRecord::RecordNotFound