Move old courses to their own page

Author: nygrenh

app/controllers/api/v8/users/recently_changed_user_details_controller.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Api
+  module V8
+    module Users
+      class RequestDeletionController < Api::V8::BaseController
+        skip_authorization_check
+
+        def index
+          return respond_access_denied unless current_user.administrator?
+          render json: { changes: RecentlyChangedUserDetail.all }
+        end
+      end
+    end
+  end
+end

app/controllers/organizations_controller.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 require 'natsort'
 
 class OrganizationsController < ApplicationController
-  before_action :set_organization, only: [:show, :destroy, :verify, :disable, :disable_reason_input, :toggle_visibility]
+  before_action :set_organization, only: %i[show destroy verify disable disable_reason_input toggle_visibility all_courses]
 
-  skip_authorization_check only: [:index, :new]
+  skip_authorization_check only: %i[index new]
 
   def index
     ordering = 'hidden, LOWER(name)'
     @organizations = Organization
-      .accepted_organizations
-      .order(ordering)
-      .reject { |org| org.hidden? && !can?(:view_hidden_organizations, nil) || !org.visibility_allowed?(request, current_user) }
+                     .accepted_organizations
+                     .order(ordering)
+                     .reject { |org| org.hidden? && !can?(:view_hidden_organizations, nil) || !org.visibility_allowed?(request, current_user) }
     @my_organizations = Organization.taught_organizations(current_user).select { |org| org.visibility_allowed?(request, current_user) }
     @my_organizations |= Organization.assisted_organizations(current_user).select { |org| org.visibility_allowed?(request, current_user) }
     @my_organizations |= Organization.participated_organizations(current_user).select { |org| org.visibility_allowed?(request, current_user) }
     @my_organizations.natsort_by!(&:name)
     @courses_under_initial_refresh = Course.where(initial_refresh_ready: false)
     @pinned_organizations = Organization
-    .accepted_organizations
-    .where(pinned: true)
-    .order(ordering)
-    .select { |org| org.visibility_allowed?(request, current_user) }
-    .reject { |org| org.hidden? && !can?(:view_hidden_organizations, nil)}
+                            .accepted_organizations
+                            .where(pinned: true)
+                            .order(ordering)
+                            .select { |org| org.visibility_allowed?(request, current_user) }
+                            .reject { |org| org.hidden? && !can?(:view_hidden_organizations, nil) }
     render layout: 'landing'
   end
 
@@ -30,6 +32,31 @@ def show
     ordering = 'hidden, disabled_status, LOWER(courses.name)'
     @my_courses = Course.participated_courses(current_user, @organization).order(ordering).select { |c| c.visible_to?(current_user) }
     @my_assisted_courses = Course.assisted_courses(current_user, @organization).order(ordering).select { |c| c.visible_to?(current_user) }
+    @ongoing_courses = @organization
+                       .courses
+                       .ongoing
+                       .enabled
+                       .order(ordering)
+                       .select { |c| c.visible_to?(current_user) }
+                       .to_a
+    if can? :teach, @organization
+      recently_updated_disabled_courses = @organization.courses
+                                                       .ongoing
+                                                       .disabled
+                                                       .where(updated_at: Time.current.all_quarter)
+                                                       .to_a
+      @ongoing_courses += recently_updated_disabled_courses
+    end
+    authorize! :read, @ongoing_courses
+  end
+
+  def all_courses
+    return respond_access_denied('Submissions for this exercise are no longer accepted.') unless current_user.administrator?
+    add_organization_breadcrumb
+    add_breadcrumb 'All Courses'
+    ordering = 'hidden, disabled_status, LOWER(courses.name)'
+    @my_courses = Course.participated_courses(current_user, @organization).order(ordering).select { |c| c.visible_to?(current_user) }
+    @my_assisted_courses = Course.assisted_courses(current_user, @organization).order(ordering).select { |c| c.visible_to?(current_user) }
     @ongoing_courses = @organization.courses.ongoing.order(ordering).select { |c| c.visible_to?(current_user) }
     @expired_courses = @organization.courses.expired.order(ordering).select { |c| c.visible_to?(current_user) }
     # @my_courses_percent_completed = percent_completed_hash(@my_courses, current_user)

app/views/courses/index.html.erb

@@ -6,10 +6,10 @@
   <% end %>
 </h2>
 
-<% if can?(:teach, @organization) && !@expired_courses.empty? %>
+<% if can?(:teach, @organization) && @expired_courses && !@expired_courses.empty? %>
   <h3>Ongoing courses</h3>
 <% end %>
-<% unless @ongoing_courses.empty? %>
+<% if @ongoing_courses && !@ongoing_courses.empty? %>
   <div class="row">
     <div class="col-md-12">
       <%= render 'courses/list', :locals => { organization_id: @organization.slug, courses: @ongoing_courses, list_id: 'ongoing-courses' } %>
@@ -19,7 +19,7 @@
   <p>No available courses.</p>
 <% end %>
 
-<% if can?(:teach, @organization) && !@expired_courses.empty? %>
+<% if can?(:teach, @organization) && @expired_courses && !@expired_courses.empty? %>
   <h3>Expired courses</h3>
   <div class="row">
     <div class="col-md-12">

app/views/organizations/all_courses.html.erb

@@ -0,0 +1,13 @@
+<h1>
+  <%= @organization.name %>
+  <%= image_tag @organization.logo.url(:small_logo) if @organization.logo? %>
+</h1>
+
+<p>
+  <%= @organization.information %>
+</p>
+
+
+<div>
+  <%= render template: 'courses/index', locals: { title: 'All courses' }  %>
+</div>

app/views/organizations/show.html.erb

@@ -136,5 +136,11 @@
 <% all_courses_title = @my_courses.empty? && @my_assisted_courses.empty? ? 'Courses' : 'All courses' %>
 
 <div>
-  <%= render template: 'courses/index', locals: { title: all_courses_title }  %>
+  <%= render template: 'courses/index', locals: { title: 'Courses' }  %>
 </div>
+
+<% if can? :teach, @organization %>
+  <%= link_to 'View all courses', all_courses_organization_path(@organization), class: 'btn btn-secondary'%>
+<% end %>
+
+<br>

config/routes.rb

@@ -127,31 +127,33 @@
 
   resources :organizations, except: [:destroy, :create, :edit, :update], path: 'org' do
 
-    resources :exercises, only: [:show] do
-      member do
-        post 'toggle_submission_result_visibility'
-      end
-      resources :submissions, only: [:create]
-      resource :solution, only: [:show]
-      resources :feedback_answers, only: [:index]
-    end
     member do
       post 'verify'
       post 'disable'
       get 'disable_reason_input'
       post 'toggle_visibility'
+      get 'all_courses'
     end
 
     collection do
       get 'list_requests'
     end
 
+    get 'course_templates', to: 'course_templates#list_for_teachers'
+
+    resources :exercises, only: [:show] do
+      member do
+        post 'toggle_submission_result_visibility'
+      end
+      resources :submissions, only: [:create]
+      resource :solution, only: [:show]
+      resources :feedback_answers, only: [:index]
+    end
+
     resources :participants, only: [:index]
 
     resources :teachers, only: [:index, :create, :destroy]
 
-    get 'course_templates', to: 'course_templates#list_for_teachers'
-
     resources :courses, except: [:new, :create] do
       member do
         get 'refresh'