Allow Abteilungsleitungen to view past members

app/abilities/pbs/group_ability.rb

@@ -29,6 +29,10 @@ module Pbs::GroupAbility
         may(:remind_census, :update_member_counts, :delete_member_counts).
         in_same_layer_or_below_if_leader
 
+      permission(:layer_and_below_full).
+          may(:show_past_members).
+          if_abteilungsleitung_in_layer
+
       permission(:approve_applications).may(:index_pending_approvals).if_layer_and_in_same_group
 
       permission(:any).may(:'index_event/camps').all
@@ -48,6 +52,11 @@ def if_mitarbeiter_gs
     role_type?(Group::Bund::MitarbeiterGs)
   end
 
+  def if_abteilungsleitung_in_layer
+    in_same_layer_or_below &&
+      role_type?(Group::Abteilung::Abteilungsleitung, Group::Abteilung::AbteilungsleitungStv)
+  end
+
   def if_layer_and_in_same_group
     if_layer_group && user.groups_with_permission(permission).map(&:id).include?(group.id)
   end

app/decorators/pbs/person_decorator.rb

@@ -24,14 +24,15 @@ def roles_grouped
 
   private
 
-    def layer_group_ids
-      @layer_group_ids ||= current_user.layer_group_ids
-    end
+  def layer_group_ids
+    @layer_group_ids ||= current_user.layer_group_ids
+  end
 
-    def visible_roles
-      @visible_roles ||= roles.select do |role|
-        layer_group_ids.include?(role.group.layer_group_id) || role.visible_from_above
-      end
+  def visible_roles
+    @visible_roles ||= roles_with_deleted.select do |role|
+      (layer_group_ids.include?(role.group.layer_group_id) || role.visible_from_above) &&
+          (!role.deleted? || can?(:show_past_members, role.group))
     end
+  end
 
 end