From 01cf341348eaec620a296a3435131798f4f17f6d Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Thu, 15 Mar 2018 00:11:01 -0700
Subject: Refs #6033 Fix stop areas spec feature

---
 app/controllers/stop_areas_controller.rb | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'app/controllers/stop_areas_controller.rb')

diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index c3da92265..e94f64e14 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -53,6 +53,7 @@ class StopAreasController < ChouetteController
 
     index! do |format|
       format.html {
+        # binding.pry
         if collection.out_of_bounds?
           redirect_to params.merge(:page => 1)
         end
@@ -215,28 +216,16 @@ class StopAreasController < ChouetteController
 
     @status = {
       in_creation: params[:q][:status]['in_creation'] == 'true',
-      activated: params[:q][:status]['activated'] == 'true',
+      confirmed: params[:q][:status]['confirmed'] == 'true',
       deactivated: params[:q][:status]['deactivated'] == 'true',
     }
 
     scope = Chouette::StopArea.where(
-      "confirmed_at #{@status[:activated] ? "IS NOT NULL" : "IS NULL"} 
+      "confirmed_at #{@status[:confirmed] ? "IS NOT NULL" : "IS NULL"} 
       AND deleted_at #{@status[:deactivated] ? "IS NOT NULL" : "IS NULL"}"
       )
 
     params[:q].delete :status
     scope
   end
-
-  # Ignore archived_at_not_null/archived_at_null managed by ransack_status scope
-  # We clone params[:q] so we can delete fake ransack filter arguments before calling search method,
-  # which will allow us to preserve params[:q] for sorting
-  def ransack_params
-    copy_params = params[:q].clone
-    copy_params.delete('associated_lines_id_eq')
-    copy_params.delete('archived_at_not_null')
-    copy_params.delete('archived_at_null')
-    copy_params
-  end
-
 end
-- 
cgit v1.2.3