Skip to content
Snippets Groups Projects
Commit bd6dd300 authored by Johannes Frenzel's avatar Johannes Frenzel
Browse files

Merge branch 'bug-fix/470-pagination-issue' into 'develop'

Fixes for  pagination issue

See merge request !363
parents 3ba8ca63 d129074e
1 merge request!363Fixes for pagination issue
Pipeline #19422 passed
...@@ -30,7 +30,7 @@ module Hyrax ...@@ -30,7 +30,7 @@ module Hyrax
experiment_file_sets = (subject_query.present? || session_query.present? || modality_query.present?) ? [] : experiment.file_sets_fast_load_metadata experiment_file_sets = (subject_query.present? || session_query.present? || modality_query.present?) ? [] : experiment.file_sets_fast_load_metadata
child_subjects = complex_subjects.sort_by_title(experiment.source.first) child_subjects = complex_subjects.sort_by_title(experiment.source.first)
members = Kaminari.paginate_array(experiment_file_sets + child_subjects).page(options[:page] || 1).per(options[:per_pag]) members = Kaminari.paginate_array(experiment_file_sets + child_subjects).page(options[:page] || 1).per(options[:per_page] || 10)
# get children # get children
all_children['experiment'][id] = gather_children(members) all_children['experiment'][id] = gather_children(members)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment