diff --git a/VERSION b/VERSION
index 250414387..b1bd4f21f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.26.5.1
+1.26.5.2
diff --git a/app/controllers/at_who_controller.rb b/app/controllers/at_who_controller.rb
index c46ab54ef..6c01dc05a 100644
--- a/app/controllers/at_who_controller.rb
+++ b/app/controllers/at_who_controller.rb
@@ -32,23 +32,29 @@ class AtWhoController < ApplicationController
end
def rep_items
- repository = Repository.find_by_id(params[:repository_id]) || Repository.active.accessible_by_teams(@team).first
- items =
- if repository && can_read_repository?(repository)
- SmartAnnotation.new(current_user, current_team, @query)
- .repository_rows(repository)
+ repository =
+ if params[:repository_id].present?
+ Repository.find_by(id: params[:repository_id])
else
- []
+ Repository.active.accessible_by_teams(@team).first
end
+ if repository && can_read_repository?(repository)
+ items = SmartAnnotation.new(current_user, current_team, @query)
+ .repository_rows(repository)
+ repository_id = repository.id
+ else
+ items = []
+ repository_id = nil
+ end
respond_to do |format|
format.json do
render json: {
- res: [render_to_string(partial: 'shared/smart_annotation/repository_items.html.erb', locals: {
- repository_rows: items
- })],
- repository: repository.id,
- team: current_team.id,
- status: :ok
+ res: [
+ render_to_string(partial: 'shared/smart_annotation/repository_items.html.erb',
+ locals: { repository_rows: items })
+ ],
+ repository: repository_id,
+ team: current_team.id
}
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8769979f9..78c6c7e86 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -69,8 +69,10 @@ module ApplicationHelper
def smart_annotation_notification(options = {})
title = options.fetch(:title) { :title_must_be_present }
message = options.fetch(:message) { :message_must_be_present }
- new_text = options.fetch(:new_text) { :new_text_must_be_present }
old_text = options[:old_text] || ''
+ new_text = options[:new_text]
+ return if new_text.blank?
+
sa_user = /\[\@(.*?)~([0-9a-zA-Z]+)\]/
# fetch user ids from the previous text
old_user_ids = []
diff --git a/app/models/tiny_mce_asset.rb b/app/models/tiny_mce_asset.rb
index b2b0bb1cf..9a7300407 100644
--- a/app/models/tiny_mce_asset.rb
+++ b/app/models/tiny_mce_asset.rb
@@ -22,12 +22,9 @@ class TinyMceAsset < ApplicationRecord
validates :estimated_size, presence: true
def self.update_images(object, images, current_user)
+ text_field = object.public_send(Extends::RICH_TEXT_FIELD_MAPPINGS[object.class.name]) || ''
# image ids that are present in text
- text_images =
- object.public_send(Extends::RICH_TEXT_FIELD_MAPPINGS[object.class.name])
- .scan(/data-mce-token="([^"]+)"/)
- .flatten
-
+ text_images = text_field.scan(/data-mce-token="([^"]+)"/).flatten
images = JSON.parse(images) + text_images
current_images = object.tiny_mce_assets.pluck(:id)
diff --git a/app/permissions/my_module.rb b/app/permissions/my_module.rb
index 69a4686c4..ee5929def 100644
--- a/app/permissions/my_module.rb
+++ b/app/permissions/my_module.rb
@@ -21,7 +21,6 @@ Canaid::Permissions.register_for(MyModule) do
update_my_module_description
manage_my_module_tags
update_my_module_status
- move_my_module
manage_my_module_steps
complete_my_module_steps
uncomplete_my_module_steps
diff --git a/app/views/experiments/_table_toolbar.html.erb b/app/views/experiments/_table_toolbar.html.erb
index daa407c11..738bedac3 100644
--- a/app/views/experiments/_table_toolbar.html.erb
+++ b/app/views/experiments/_table_toolbar.html.erb
@@ -12,7 +12,7 @@
<% end %>
<% if can_manage_experiment?(@experiment) %>
<% end %>
-