further optimization re: #82

publiclab · Mar 2, 2015 · a7c7d5b · a7c7d5b
1 parent 394a6bf
commit a7c7d5b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/controllers/spectrums_controller.rb b/app/controllers/spectrums_controller.rb
@@ -59,12 +59,12 @@ def compare
   # non REST
   def search
     params[:id] = params[:q].to_s if params[:id].nil?
-    @spectrums = Spectrum.find(:all, :conditions => ['title LIKE ? OR notes LIKE ?',"%"+params[:id]+"%", "%"+params[:id]+"%"],:limit => 100, :order => "id DESC")
+    @spectrums = Spectrum.where('title LIKE ? OR notes LIKE ?',"%"+params[:id]+"%", "%"+params[:id]+"%").order("id DESC").paginate(:page => params[:page])
     @spectrums = @spectrums.paginate :page => params[:page], :per_page => 24
     if params[:capture]
       render :partial => "capture/results", :layout => false
     else 
-      @sets = SpectraSet.find(:all, :conditions => ['title LIKE ? OR notes LIKE ?',"%"+params[:id]+"%", "%"+params[:id]+"%"],:limit => 100, :order => "id DESC")
+      @sets = SpectraSet.where('title LIKE ? OR notes LIKE ?',"%"+params[:id]+"%", "%"+params[:id]+"%").order("id DESC").paginate(:page => params[:set_page])
     end
   end
 

diff --git a/app/views/spectrums/search.html.erb b/app/views/spectrums/search.html.erb
@@ -16,10 +16,12 @@
     <hr />
     <h3>Related sets</h3>
     <%= render :partial => 'sets' %>
+    <%= will_paginate @sets, :param_name => :set_page, renderer: BootstrapPagination::Rails %>
   </div>
 
   <div class="span8">
     <%= render :partial => 'list' %>
+    <%= will_paginate @spectrums, renderer: BootstrapPagination::Rails %>
   </div>
 </div>
 </div>