Merge branch 'bug/102_fix_pagination_issue' into 'develop'

[102] fixed pagination issue and make jstree by default collapsed.

Closes antleaf-projectmanagement#102

See merge request FDM/rdm-system/rdms!198

hyrax/app/assets/javascripts/jstree_init.js

 Blacklight.onLoad(function() {
-    $('.treeview').jstree("open_all");
+    $('.treeview').jstree();
     $(".treeview").on("click", ".jstree-anchor", function(evt)
     {
         var link = $(evt.target).attr("href");

hyrax/app/controllers/hyrax/crc_datasets/complex_modalities_controller.rb

@@ -6,7 +6,7 @@ module Hyrax
       before_action :set_crc_dataset, except: %i[validate_modality_title]
       before_action :set_complex_session, only: %i[new create]
       before_action :set_complex_modality, only: %i[show edit update]
-      before_action :check_tombstone
+      before_action :check_tombstone, except: %i[validate_modality_title]
       before_action :authorize, only: [:new, :edit]
       with_themed_layout :decide_layout
 
@@ -19,7 +19,7 @@ module Hyrax
       end
 
       def show
-        @modality_members = Kaminari.paginate_array(@complex_modality.file_sets_fast_load_metadata).page(params[:page] || 1).per(params[:per_page] || 5)
+        @modality_members = Kaminari.paginate_array(@complex_modality.file_sets_fast_load_metadata).page(params[:page] || 1).per(params[:per_page] || 10)
         @workflow = WorkflowPresenter.new(@crc_dataset, current_ability)
       end
 

hyrax/app/controllers/hyrax/crc_datasets/complex_sessions_controller.rb

@@ -6,7 +6,7 @@ module Hyrax
       before_action :set_crc_dataset, except: %i[validate_session_title]
       before_action :set_complex_subject, only: %i[new create]
       before_action :set_complex_session, only: %i[show edit update]
-      before_action :check_tombstone
+      before_action :check_tombstone, except: %i[validate_session_title]
       before_action :authorize, only: [:new, :edit]
       with_themed_layout :decide_layout
 
@@ -17,7 +17,7 @@ module Hyrax
       def edit; end
 
       def show
-        @session_members = Kaminari.paginate_array(@complex_session.file_sets_fast_load_metadata + @complex_session.complex_modalities).page(params[:page] || 1).per(params[:per_page] || 5)
+        @session_members = Kaminari.paginate_array(@complex_session.file_sets_fast_load_metadata + @complex_session.complex_modalities).page(params[:page] || 1).per(params[:per_page] || 10)
         @workflow = WorkflowPresenter.new(@crc_dataset, current_ability)
       end
 

hyrax/app/controllers/hyrax/crc_datasets/complex_subjects_controller.rb

@@ -5,7 +5,7 @@ module Hyrax
     class ComplexSubjectsController < ApplicationController
       before_action :set_crc_dataset, except: %i[validate_subject_title]
       before_action :set_complex_subject, only: %i[show edit update]
-      before_action :check_tombstone
+      before_action :check_tombstone, except: %i[validate_subject_title]
       before_action :authorize, only: [:new, :edit]
       with_themed_layout :decide_layout
 
@@ -16,7 +16,7 @@ module Hyrax
       def edit; end
 
       def show
-        @subject_members = Kaminari.paginate_array(@complex_subject.file_sets_fast_load_metadata + @complex_subject.complex_sessions).page(params[:page] || 1).per(params[:per_page] || 5)
+        @subject_members = Kaminari.paginate_array(@complex_subject.file_sets_fast_load_metadata + @complex_subject.complex_sessions).page(params[:page] || 1).per(params[:per_page] || 10)
         @workflow = WorkflowPresenter.new(@crc_dataset, current_ability)
       end
 

hyrax/app/presenters/hyrax/crc_dataset_presenter.rb

@@ -16,7 +16,7 @@ module Hyrax
       experiment = CrcDataset.find(self.id)
       members = experiment.file_sets_fast_load_metadata + experiment.complex_subjects
 
-      members = Kaminari.paginate_array(members).page(options[:page] || 1).per(options[:per_page] || 5)
+      members = Kaminari.paginate_array(members).page(options[:page] || 1).per(options[:per_page] || 10)
 
       all_children['experiment'][id] = gather_children(members)
       # get subject children