Issue #3561 - Refactoring code based on comments bt @aaronskiba

Changes:
  - Refactored Org model org_admin_plans() method.
  - Refactored Paginable Plans controller method org_admin().

Author: johnpinto1

app/controllers/paginable/plans_controller.rb

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

app/models/org.rb

@@ -288,19 +288,17 @@ def org_admins
   # This replaces the old plans method. We now use the native plans method and this.
   # rubocop:disable Metrics/AbcSize
   def org_admin_plans
-    combined_plan_ids = (native_plan_ids + affiliated_plan_ids).flatten.uniq
-
-    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)
+    scope = Plan.includes(:template, :phases, :roles, :users)
+                .where(id: (native_plan_ids + affiliated_plan_ids).uniq)
+                .where(roles: { active: true })
+                .where(Role.creator_condition)
+
+    unless Rails.configuration.x.plans.org_admins_read_all
+      scope = scope.where.not(visibility: Plan.visibilities[:privately_visible])
+                   .where.not(visibility: Plan.visibilities[:is_test])
     end
+
+    scope
   end
   # rubocop:enable Metrics/AbcSize