JM - (SPARCDashboard) Tie Search field Option with RMID configuration…

… [#151658427]
sparc-request · Oct 27, 2017 · 2df5cf6 · 2df5cf6
1 parent be8f0a6
commit 2df5cf6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/models/protocol_filter.rb b/app/models/protocol_filter.rb
@@ -47,4 +47,12 @@ def href
       }
     )
   end
+
+  def self.search_filters
+    if Setting.find_by_key("research_master_enabled").value
+        ['Authorized User', 'HR#', 'PI', 'Protocol ID', 'PRO#', 'RMID', 'Short/Long Title']
+    else
+        ['Authorized User', 'HR#', 'PI', 'Protocol ID', 'PRO#', 'Short/Long Title']
+    end
+  end
 end
diff --git a/app/views/dashboard/protocol_filters/_filter_protocols_form.html.haml b/app/views/dashboard/protocol_filters/_filter_protocols_form.html.haml
@@ -44,7 +44,7 @@
               = form.fields_for :search_query do |search|
                 .input-group-btn
                   .dd_select
-                    = search.select :search_drop, options_for_select(t(:dashboard)[:protocol_filters][:search_by_options], filterrific.search_query.try(:search_drop)), { prompt:  t(:dashboard)[:protocol_filters][:search_by] }, class: "form-control selectpicker ", data: { style: 'dropdown_filter' }
+                    = search.select :search_drop, options_for_select(ProtocolFilter.search_filters, filterrific.search_query.try(:search_drop)), { prompt:  t(:dashboard)[:protocol_filters][:search_by] }, class: "form-control selectpicker ", data: { style: 'dropdown_filter' }
                 = search.text_field :search_text, value: filterrific.search_query.try(:search_text), class: 'form-control'
 
         .form-group.row

diff --git a/config/locales/dashboard.en.yml b/config/locales/dashboard.en.yml
@@ -170,7 +170,6 @@ en:
     protocol_filters:
       header: "Filter Protocols"
       search_by: "Search All"
-      search_by_options: ['Authorized User', 'HR#', 'PI', 'Protocol ID', 'PRO#', 'RMID', 'Short/Long Title']
       archived: "Archived"
       inactive: "(inactive)"
       status: "Status"