baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Refactor methods

pull/2666/head
Manny Dinssa 2 years ago
parent
6aa65c48cd
commit
f42e40e1e7
1 changed files with 5 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      app/helpers/filters_helper.rb

15
app/helpers/filters_helper.rb
Unescape View File

@ -346,36 +346,31 @@ private
def assigned_to_filter_selected?(selected_filters, value) def assigned_to_filter_selected?(selected_filters, value)
return true if !selected_filters.key?("user") && value == :all return true if !selected_filters.key?("user") && value == :all
return true if selected_filters["assigned_to"] == value.to_s
false selected_filters["assigned_to"] == value.to_s
end end
def owning_organisation_filter_selected?(selected_filters, value) def owning_organisation_filter_selected?(selected_filters, value)
return true if !selected_filters.key?("owning_organisation") && value == :all return true if !selected_filters.key?("owning_organisation") && value == :all
return true if (selected_filters["owning_organisation"].present? || selected_filters["owning_organisation_text_search"].present?) && value == :specific_org
false (selected_filters["owning_organisation"].present? || selected_filters["owning_organisation_text_search"].present?) && value == :specific_org
end end
def managing_organisation_filter_selected?(selected_filters, value) def managing_organisation_filter_selected?(selected_filters, value)
return true if !selected_filters.key?("managing_organisation") && value == :all return true if !selected_filters.key?("managing_organisation") && value == :all
return true if (selected_filters["managing_organisation"].present? || selected_filters["managing_organisation_text_search"].present?) && value == :specific_org
false (selected_filters["managing_organisation"].present? || selected_filters["managing_organisation_text_search"].present?) && value == :specific_org
end end
def uploaded_by_filter_selected?(selected_filters, value) def uploaded_by_filter_selected?(selected_filters, value)
return true if !selected_filters.key?("user") && value == :all return true if !selected_filters.key?("user") && value == :all
return true if selected_filters["uploaded_by"] == value.to_s
false selected_filters["uploaded_by"] == value.to_s
end end
def uploading_organisation_filter_selected?(selected_filters, value) def uploading_organisation_filter_selected?(selected_filters, value)
return true if !selected_filters.key?("uploading_organisation") && value == :all return true if !selected_filters.key?("uploading_organisation") && value == :all
return true if (selected_filters["uploading_organisation"].present? || selected_filters["uploading_organisation_text_search"].present?) && value == :specific_org
false (selected_filters["uploading_organisation"].present? || selected_filters["uploading_organisation_text_search"].present?) && value == :specific_org
end end
end end

Write Preview
Loading…
Cancel
Save