Don't show activation buttons for schemes at merged orgs

7 months ago · 070989b6c4
2 changed files with 2 additions and 2 deletions
--- a/app/views/locations/show.html.erb
+++ b/app/views/locations/show.html.erb
@ -47,7 +47,7 @@
  </div>
 </div>

-<% if @location.scheme.owning_organisation.active? && LocationPolicy.new(current_user, @location).deactivate? %>
+<% if @location.scheme.owning_organisation.status == :active && LocationPolicy.new(current_user, @location).deactivate? %>
  <%= toggle_location_link(@location) %>
 <% end %>

--- a/app/views/schemes/show.html.erb
+++ b/app/views/schemes/show.html.erb
@ -52,7 +52,7 @@
  </div>
 </div>

-<% if @scheme.owning_organisation.active? && SchemePolicy.new(current_user, @scheme).deactivate? %>
+<% if @scheme.owning_organisation.status == :active && SchemePolicy.new(current_user, @scheme).deactivate? %>
  <%= toggle_scheme_link(@scheme) %>
 <% end %>