Browse Source

Add managed by filter to sales

pull/2077/head
Kat 3 years ago
parent
commit
e1bfca4e14
  1. 2
      app/helpers/filters_helper.rb
  2. 6
      app/views/logs/_log_filters.html.erb

2
app/helpers/filters_helper.rb

@ -129,7 +129,7 @@ module FiltersHelper
end end
def non_support_with_multiple_managing_orgs? def non_support_with_multiple_managing_orgs?
current_user.organisation.managing_agents.count > 1 && user_lettings_path? || current_user.organisation.has_recent_absorbed_organisations? current_user.organisation.managing_agents.count > 1 || current_user.organisation.has_recent_absorbed_organisations?
end end
def user_lettings_path? def user_lettings_path?

6
app/views/logs/_log_filters.html.erb

@ -93,7 +93,7 @@
} %> } %>
<% end %> <% end %>
<% if (current_user.support? || non_support_with_multiple_managing_orgs?) && user_or_org_lettings_path? %> <% if (current_user.support? || non_support_with_multiple_managing_orgs?) && (user_or_org_lettings_path? || FeatureToggle.sales_managing_organisation_enabled?) %>
<%= render partial: "filters/radio_filter", locals: { <%= render partial: "filters/radio_filter", locals: {
f:, f:,
options: { options: {
@ -102,13 +102,13 @@
label: "Specific managing organisation", label: "Specific managing organisation",
conditional_filter: { conditional_filter: {
type: "select", type: "select",
label: "Managed by", label: user_or_org_lettings_path? ? "Managed by" : "Reported by",
category: "managing_organisation", category: "managing_organisation",
options: managing_organisation_filter_options(current_user), options: managing_organisation_filter_options(current_user),
}, },
}, },
}, },
label: "Managed by", label: user_or_org_lettings_path? ? "Managed by" : "Reported by",
category: "managing_organisation_select", category: "managing_organisation_select",
} %> } %>
<% end %> <% end %>

Loading…
Cancel
Save