Download as
Browse Code »

Commit 1b32760e01512625ead6ccdc1395b5beef22656f

Authored by Cyril Mougel
1 parent dfa2ec85
Exists in master and in 1 other branch production

Stop using js on search pagination 

The pagination don't work with the javascript request

See #528
Showing 3 changed files with 9 additions and 6 deletions   Show diff stats
app/controllers/problems_controller.rb
  Diff comments   View file @1b32760
... ... @@ -125,10 +125,13 @@ class ProblemsController < ApplicationController
125 125 end
126 126  
127 127 def search
128   - @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)
129   - @selected_problems = params[:problems] || []
130   - @problems = @problems.page(params[:page]).per(current_user.per_page)
131   - render :content_type => 'text/javascript'
  128 + 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)
  129 + selected_problems = params[:problems] || []
  130 + self.problems = ps.page(params[:page]).per(2)
  131 + respond_to do |format|
  132 + format.html { render :index }
  133 + format.js
  134 + end
132 135 end
133 136  
134 137 protected
... ...
app/views/problems/search.js.haml
  Diff comments   View file @1b32760
1   -$("#problem_table").empty().append("#{escape_javascript(render('problems/table', :problems => @problems))}");
  1 +$("#problem_table").empty().append("#{escape_javascript(render('problems/table', :problems => problems))}");
2 2 $("#flash-messages").empty()
... ...
config/routes.rb
  Diff comments   View file @1b32760
... ... @@ -21,7 +21,7 @@ Errbit::Application.routes.draw do
21 21 post :unresolve_several
22 22 post :merge_several
23 23 post :unmerge_several
24   - get :search, :format => [:js]
  24 + get :search
25 25 end
26 26 end
27 27  
... ...