Back to index on the form will go back to page 2, retain field sortin…

…g, etc

lib/admin_assistant/request/base.rb

@@ -45,7 +45,8 @@ def model_class_symbol
       end
 
       def origin
-        @controller.params[:origin] || @controller.request.referer
+        @controller.params[:origin] || @controller.request.referer ||
+            {:action => 'index'}
       end
 
       def render_single_form(record)

lib/views/form.html.erb

@@ -8,7 +8,7 @@ form_view = AdminAssistant::FormView.new(@record, @admin_assistant, self)
   <div class="aa_header">
     <h2><%= h(form_view.title) %></h2>
     <div class="actions">
-    <%= link_to('Back to index', :action => 'index') %>
+    <%= link_to('Back to index', @origin) %>
     </div>
   </div>
   <% if !@record.errors.empty? %>

test_rails_app/spec/controllers/admin/blog_posts_controller_spec.rb

@@ -89,7 +89,9 @@
 
     describe 'when there are validation errors' do
       before :each do
-        post :create, :blog_post => {:title => ''}
+        post(
+          :create, :blog_post => {:title => ''}, :origin => '/admin/blog_posts'
+        )
       end
 
       it 'should not create a new BlogPost' do
@@ -116,11 +118,12 @@
   end
 
   describe '#edit' do
-     before :all do
+    before :all do
       @blog_post = BlogPost.create! :title => random_word, :user => @user
     end
 
     before :each do
+      @request.env["HTTP_REFERER"] = '/admin/blog_posts'
       get :edit, :id => @blog_post.id
     end
 
@@ -719,6 +722,7 @@
   describe '#new' do
     before :each do
       @alfie = User.find_or_create_by_username 'alfie'
+      @request.env["HTTP_REFERER"] = '/admin/blog_posts'
       get :new
     end
 
@@ -895,7 +899,11 @@
 
     describe 'when there are validation errors' do
       before :each do
-        post :update, :id => @blog_post.id, :blog_post => {:title => ''}
+        post(
+          :update,
+          :id => @blog_post.id, :blog_post => {:title => ''},
+          :origin => '/admin/blog_posts'
+        )
       end
 
       it 'should not create a new BlogPost' do

test_rails_app/test/integration/admin_blog_posts_integration_test.rb

@@ -12,4 +12,14 @@ def test_comes_back_to_index_sorted_by_published_at_after_successful_creation
     click_button 'Create'
     assert_select 'th.asc', :text => 'Published at'
   end
+
+  def test_back_to_index_comes_back_to_index_sorted_by_published_at
+    user = User.find_or_create_by_username 'soren'
+    BlogPost.create! :title => random_word, :user => user
+    visit "/admin/blog_posts"
+    click_link "Published at"
+    click_link "New blog post"
+    click_link "Back to index"
+    assert_select 'th.asc', :text => 'Published at'
+  end
 end