Update Licence Scope for Student View of Review and Submit steps

yorkulibraries · Aug 13, 2024 · 206e4c7 · 206e4c7
1 parent 5957d31
commit 206e4c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/controllers/student_view_controller.rb b/app/controllers/student_view_controller.rb
@@ -46,13 +46,13 @@ def thesis_process_router
     when Thesis::PROCESS_REVIEW
       @primary_documents = @thesis.documents.not_deleted.primary
       @supplemental_documents = @thesis.documents.not_deleted.supplemental
-      @licence_documents = @thesis.documents.not_deleted.supplemental.licence_type
+      @licence_documents = @thesis.documents.not_deleted.licence
       render_according_to_validation('student_view/process/review')
     when Thesis::PROCESS_SUBMIT
       @primary_documents = @thesis.documents.not_deleted.primary
       @supplemental_documents = @thesis.documents.not_deleted.supplemental
-      @licence_documents = @thesis.documents.not_deleted.supplemental.licence_type
-      @embargo_documents = @thesis.documents.not_deleted.supplemental.embargo_type
+      @licence_documents = @thesis.documents.not_deleted.licence
+      @embargo_documents = @thesis.documents.not_deleted.embargo
       render_according_to_validation('student_view/process/submit')
     when Thesis::PROCESS_STATUS
       render_according_to_validation('student_view/process/status')

diff --git a/app/models/document.rb b/app/models/document.rb
@@ -20,9 +20,7 @@ class Document < ApplicationRecord
   scope :supplemental, -> { where(usage: :thesis).where('supplemental = ? ', true) }
   scope :deleted, -> { where('deleted = ?', true) }
   scope :not_deleted, -> { where('deleted = ?', false) }
-  scope :licence_type, -> { where(usage: :licence) }
-  scope :embargo_type, -> { where(usage: [:embargo, :embargo_letter])}
-
+
   scope :licence, -> { where(usage: :licence) }
   scope :embargo, -> { where(usage: [:embargo, :embargo_letter])}