Merge branch 'develop'

VERSION

@@ -1 +1 @@
-1.26.5.1
+1.26.5.2

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

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 = []

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)

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

app/views/experiments/_table_toolbar.html.erb

@@ -20,7 +20,7 @@
         <span class="button-text"><%= t("experiments.table.toolbar.duplicate") %></span>
       </button>
     <% end %>
-    <button id="moveTask" class="btn btn-light multiple-object-action hidden only-active" data-for="moveable">
+    <button id="moveTask" class="btn btn-light multiple-object-action hidden" data-for="moveable">
       <i class="fas fa-arrow-right"></i>
       <span class="button-text"><%= t("experiments.table.toolbar.move") %></span>
     </button>

yarn.lock

@@ -10995,9 +10995,9 @@ typescript@^2.5.1:
   integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
 ua-parser-js@^0.7.18:
-  version "0.7.28"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
-  integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
+  version "0.7.33"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
+  integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==
 
 uncontrollable@^4.1.0:
   version "4.1.0"