Issue #3561 - Fix for bug "Discrepancy in Org Admin view of the

Organisation Plans and the related CSV Download".

Changes:
- where(Role.creator_condition) condition added to Plans retrieved in
  the Org model's org_admin_plans method. This ensures that Plans
returned are only active plans. Note: if an owner or co-owner
de-activates a plan the Role of the user is set to active: false, so any
plan with creator with role (having active: false) would mean the Plan
is removed.
- To avoid duplication we removed .where(Role.creator_condition) in
  org_admin method in app/controllers/paginable/plans_controller.rb from
  line
   plans = plans.joins(:template, roles: [user::org]).where(Role.creator_condition).

Author: John Pinto

app/controllers/paginable/plans_controller.rb

@@ -46,7 +46,7 @@ def org_admin
       @super_admin = current_user.can_super_admin?
       @clicked_through = params[:click_through].present?
       plans = @super_admin ? Plan.all : current_user.org.org_admin_plans
-      plans = plans.joins(:template, roles: [user: :org]).where(Role.creator_condition)
+      plans = plans.joins(:template, roles: [user: :org])
 
       paginable_renderise(
         partial: 'org_admin',

app/models/org.rb

@@ -292,11 +292,13 @@ def org_admin_plans
     if Rails.configuration.x.plans.org_admins_read_all
       Plan.includes(:template, :phases, :roles, :users).where(id: combined_plan_ids)
           .where(roles: { active: true })
+          .where(Role.creator_condition)
     else
       Plan.includes(:template, :phases, :roles, :users).where(id: combined_plan_ids)
           .where.not(visibility: Plan.visibilities[:privately_visible])
           .where.not(visibility: Plan.visibilities[:is_test])
           .where(roles: { active: true })
+          .where(Role.creator_condition)
     end
   end
   # rubocop:enable Metrics/AbcSize