diff --git a/app/controllers/v1/learning_objects_controller.rb b/app/controllers/v1/learning_objects_controller.rb index a04c43dd7743427502f4839eace34313467f9a90..ed62d375753834f4b230efb7cee71bcedc1f8736 100644 --- a/app/controllers/v1/learning_objects_controller.rb +++ b/app/controllers/v1/learning_objects_controller.rb @@ -142,7 +142,7 @@ class V1::LearningObjectsController < ApplicationController params[:learning_object].permit(subjects: [], educational_stages: [], tags: [:name]) end - def learning_object_associations(learning_object, change_object_type_id) + def learning_object_associations(learning_object, change_object_type_id=false) if extra_params[:tags] == [] current_user.untag(learning_object, with: @learning_object.tags.map { |t| t['name'] }) elsif !extra_params[:tags].nil? @@ -150,6 +150,7 @@ class V1::LearningObjectsController < ApplicationController end learning_object.add_subjects(ids: extra_params[:subjects]) unless extra_params[:subjects].nil? learning_object.add_educational_stages(ids: extra_params[:educational_stages]) unless extra_params[:educational_stages].nil? + if change_object_type_id learning_object.link = nil end diff --git a/app/services/activities_filter_service.rb b/app/services/activities_filter_service.rb index 99c8b54ad74acc4ce40f3bd6fafc7e696fe6ca32..4039e123f2acaa4d07f2d6a818c79037dcae9b6d 100644 --- a/app/services/activities_filter_service.rb +++ b/app/services/activities_filter_service.rb @@ -21,7 +21,9 @@ module ActivitiesFilterService def activities_filtered if !self.try(:draft?) - self.activities.where(key: activities_filter) + acts = self.activities.where(key: activities_filter) + ret = acts.select { |a| a.trackable != nil || a.key =~ /.\.destroy/ } + ret else [] end