From 9a9f8b9c418538ae312221cd7be9f7a5563ddff5 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 19 Jun 2017 16:45:57 +0200 Subject: [PATCH 1/2] Fix total number of records in task repository [SCI-1381] --- app/datatables/repository_datatable.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/datatables/repository_datatable.rb b/app/datatables/repository_datatable.rb index b97db6d95..7f23f9408 100644 --- a/app/datatables/repository_datatable.rb +++ b/app/datatables/repository_datatable.rb @@ -158,6 +158,7 @@ class RepositoryDatatable < AjaxDatatablesRails::Base ) .joins(:created_by) .where(repository: @repository) + return @assigned_rows if params[:assigned] == 'assigned' else @assigned_rows = repository_rows.joins( 'INNER JOIN my_module_repository_rows ON From 115ce91d8df5bd8305a01ee1c0c41405d6489941 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Tue, 20 Jun 2017 15:58:52 +0200 Subject: [PATCH 2/2] Handle column mappings in task repository [SCI-1381] --- app/datatables/repository_datatable.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/datatables/repository_datatable.rb b/app/datatables/repository_datatable.rb index 7f23f9408..bdc46480f 100644 --- a/app/datatables/repository_datatable.rb +++ b/app/datatables/repository_datatable.rb @@ -149,6 +149,14 @@ class RepositoryDatatable < AjaxDatatablesRails::Base .joins(:created_by) .where(repository: @repository) + # Make mappings of custom columns, so we have same id for every column + i = 5 + @columns_mappings = {} + @repository.repository_columns.each do |column| + @columns_mappings[column.id] = i.to_s + i += 1 + end + if @my_module @assigned_rows = @my_module.repository_rows .preload( @@ -166,13 +174,6 @@ class RepositoryDatatable < AjaxDatatablesRails::Base ) end - # Make mappings of custom columns, so we have same id for every column - i = 5 - @columns_mappings = {} - @repository.repository_columns.each do |column| - @columns_mappings[column.id] = i.to_s - i += 1 - end repository_rows end @@ -182,7 +183,6 @@ class RepositoryDatatable < AjaxDatatablesRails::Base # number of samples/all samples it's dependant upon sort_record query def fetch_records records = get_raw_records - records = @assigned_rows if @my_module && params[:assigned] == 'assigned' records = filter_records(records) if params[:search].present? records = sort_records(records) if params[:order].present? records = paginate_records(records) unless params[:length].present? &&