From 116747f261efb9d1200c098a392dd8e4d8008b4e Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 28 May 2020 15:35:19 +0200 Subject: [PATCH] Filter private assigned tasks --- app/controllers/repository_rows_controller.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb index fdb82f49c..26b177a4d 100644 --- a/app/controllers/repository_rows_controller.rb +++ b/app/controllers/repository_rows_controller.rb @@ -154,14 +154,13 @@ class RepositoryRowsController < ApplicationController def assigned_task_list assigned_modules = @repository_row.my_modules.joins(experiment: :project) + .where_attributes_like( + ['my_modules.name', 'experiments.name', 'projects.name'], + params[:query], + whole_phrase: true + ) viewable_modules = assigned_modules.viewable_by_user(current_user, current_user.teams) private_modules = assigned_modules - viewable_modules - - viewable_modules = viewable_modules.where_attributes_like( - ['my_modules.name', 'experiments.name', 'projects.name'], - params[:query], - whole_phrase: true - ) render json: { html: render_to_string(partial: 'shared/my_modules_list_partial.html.erb', locals: { my_modules: viewable_modules,