Merge pull request #6373 from andrewpbrett/fix-admin-users

specify Spree routes for pagination, fix 500 on admin/users

app/views/spree/admin/users/index.html.haml

@@ -26,7 +26,9 @@
         %td.user_enterprise_limit= user.enterprise_limit
         %td.actions
           = link_to_delete user, no_text: true
-= paginate @users
+- _with_routes Spree::Core::Engine.routes do
+  = paginate @users
+
 - content_for :sidebar_title do
   = t(".search")
 - content_for :sidebar do

app/views/spree/admin/zones/index.html.haml

@@ -7,7 +7,8 @@
   %li
     = button_link_to t("spree.new_zone"), new_object_url, icon: 'icon-plus', id: 'admin_new_zone_link'
 
-= paginate @zones
+- _with_routes Spree::Core::Engine.routes do
+  = paginate @zones
 
 - if @zones.empty?
   .no-objects-found
@@ -38,4 +39,5 @@
           %td.actions
             = link_to_edit zone, no_text: true
             = link_to_delete zone, no_text: true
-= paginate @zones
+- _with_routes Spree::Core::Engine.routes do
+  = paginate @zones