From 1b32760e01512625ead6ccdc1395b5beef22656f Mon Sep 17 00:00:00 2001 From: Cyril Mougel Date: Thu, 22 Aug 2013 23:23:10 +0200 Subject: [PATCH] Stop using js on search pagination --- app/controllers/problems_controller.rb | 11 +++++++---- app/views/problems/search.js.haml | 2 +- config/routes.rb | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/controllers/problems_controller.rb b/app/controllers/problems_controller.rb index ae76d05..9d90b2c 100644 --- a/app/controllers/problems_controller.rb +++ b/app/controllers/problems_controller.rb @@ -125,10 +125,13 @@ class ProblemsController < ApplicationController end def search - @problems = Problem.search(params[:search]).for_apps(app_scope).in_env(params[:environment]).all_else_unresolved(params[:all_errs]).ordered_by(params_sort, params_order) - @selected_problems = params[:problems] || [] - @problems = @problems.page(params[:page]).per(current_user.per_page) - render :content_type => 'text/javascript' + ps = Problem.search(params[:search]).for_apps(app_scope).in_env(params[:environment]).all_else_unresolved(params[:all_errs]).ordered_by(params_sort, params_order) + selected_problems = params[:problems] || [] + self.problems = ps.page(params[:page]).per(2) + respond_to do |format| + format.html { render :index } + format.js + end end protected diff --git a/app/views/problems/search.js.haml b/app/views/problems/search.js.haml index 010ceac..623bb14 100644 --- a/app/views/problems/search.js.haml +++ b/app/views/problems/search.js.haml @@ -1,2 +1,2 @@ -$("#problem_table").empty().append("#{escape_javascript(render('problems/table', :problems => @problems))}"); +$("#problem_table").empty().append("#{escape_javascript(render('problems/table', :problems => problems))}"); $("#flash-messages").empty() diff --git a/config/routes.rb b/config/routes.rb index 6db119a..2634ef1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,7 +21,7 @@ Errbit::Application.routes.draw do post :unresolve_several post :merge_several post :unmerge_several - get :search, :format => [:js] + get :search end end -- libgit2 0.21.2