Merge pull request #2434 from DMPRoadmap/issue_2346

Issue 2346 - Create a super admin view of the Plans report

Author: briri

app/controllers/org_admin/plans_controller.rb

@@ -14,7 +14,8 @@ def index
       .where('users.org_id = ? AND plans.feedback_requested is TRUE AND roles.active is TRUE',
               current_user.org_id).pluck(:plan_id)
     @feedback_plans = Plan.where(id: feedback_ids).reject{|p| p.nil?}
-    @plans = current_user.org.plans.page(1)
+    @super_admin = current_user.can_super_admin?
+    @plans = @super_admin ? Plan.all.page(1) : current_user.org.plans.page(1)
   end
 
   # GET org_admin/plans/:id/feedback_complete

app/controllers/paginable/plans_controller.rb

@@ -42,9 +42,15 @@ def org_admin
     unless current_user.present? && current_user.can_org_admin?
       raise Pundit::NotAuthorizedError
     end
+    #check if current user if super_admin
+    @super_admin = current_user.can_super_admin?
+    plans = @super_admin ? Plan.all : current_user.org.plans
+    plans = plans.joins(:template, roles: [user: :org]).where(Role.creator_condition)
+
     paginable_renderise(
       partial: "org_admin",
-      scope: current_user.org.plans,
+      scope: plans,
+      view_all: !current_user.can_super_admin?,
       query_params: { sort_field: 'plans.updated_at', sort_direction: :desc }
     )
   end

app/models/plan.rb

@@ -164,8 +164,11 @@ class Plan < ActiveRecord::Base
 
   scope :search, lambda { |term|
     search_pattern = "%#{term}%"
-    joins(:template)
+    joins(:template, roles: [user: :org])
+    .where(Role.creator_condition)
     .where("lower(plans.title) LIKE lower(:search_pattern)
+            OR lower(orgs.name) LIKE lower (:search_pattern)
+            OR lower(orgs.abbreviation) LIKE lower (:search_pattern)
             OR lower(templates.title) LIKE lower(:search_pattern)
             OR lower(plans.principal_investigator) LIKE lower(:search_pattern)
             OR lower(plans.principal_investigator_identifier) LIKE lower(:search_pattern)",

app/views/org_admin/plans/index.html.erb

@@ -34,18 +34,21 @@
         </div>
       </div>
     <% end %>
-    <% if @plans.length > 0 %>
-      <%= link_to sanitize(_('Download plans <em class="sr-only">(new window)</em><span class="new-window-popup-info">%{open_in_new_window_text}</span>') %
+    <% if @plans.length > 0  %>
+      <% unless @super_admin %>
+        <%= link_to sanitize(_('Download plans <em class="sr-only">(new window)</em><span class="new-window-popup-info">%{open_in_new_window_text}</span>') %
                            { open_in_new_window_text: _('Opens in new window') },
                            tags: %w{ span em }),
                   org_admin_download_plans_path(format: :csv),
                   target: '_blank',
                   class: 'btn btn-default pull-right has-new-window-popup-info' %>
+      <% end %>
       <%= paginable_renderise(
         partial: '/paginable/plans/org_admin',
         controller: 'paginable/plans',
         action: 'org_admin',
         scope: @plans,
+        view_all: !current_user.can_super_admin?,
         query_params: { sort_field: 'plans.updated_at', sort_direction: :desc }) %>
     <% end %>
   </div>

app/views/paginable/plans/_org_admin.html.erb

@@ -4,7 +4,7 @@
       <tr>
         <th scope="col"><%= _('Project Title') %>&nbsp;<%= paginable_sort_link('plans.title') %></th>
         <th scope="col"><%= _('Template') %>&nbsp;<%= paginable_sort_link('templates.title') %></th>
-        <th scope="col"><%= _('Organisation') %></th>
+        <th scope="col"><%= _('Organisation') %>&nbsp;<%= paginable_sort_link('orgs.name') %></th>
         <th scope="col"><%= _('Owner') %></th>
         <th scope="col" class="date-column"><%= _('Updated') %>&nbsp;<%= paginable_sort_link('plans.updated_at') %></th>
         <th scope="col"><%= _('Visibility') %></th>

spec/models/plan_spec.rb

@@ -457,7 +457,7 @@
 
     context "when Plan title matches term" do
 
-      let!(:plan)  { create(:plan, title: "foolike title") }
+      let!(:plan)  { create(:plan, :creator, title: "foolike title") }
 
       it { is_expected.to include(plan) }
 
@@ -467,20 +467,39 @@
 
       let!(:template) { create(:template, title: "foolike title") }
 
-      let!(:plan)  { create(:plan, template: template) }
+      let!(:plan)  { create(:plan, :creator, template: template) }
 
       it { is_expected.to include(plan) }
 
     end
 
+    context "when Organisation name matches term" do
+
+      let!(:plan)  { create(:plan, :creator, description: "foolike desc") }
+
+      let!(:org) { create(:org, name: 'foolike name') }
+
+      before do
+        user = plan.owner
+        user.org = org
+        user.save
+      end
+
+      it "returns organisation name" do
+          expect(subject).to include(plan)
+      end
+
+    end
+
     context "when neither title matches term" do
 
-      let!(:plan)  { create(:plan, description: "foolike desc") }
+      let!(:plan)  { create(:plan, :creator, description: "foolike desc") }
 
       it { is_expected.not_to include(plan) }
 
     end
 
+
   end
 
   describe "#answer" do