scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-13 01:41:09 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix task protocol editing with empty description [SCI-7823] (#4897)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-01-27 14:15:09 +01:00 • committed by GitHub
parent 2988390876
commit 02da980ab8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/application_helper.rb
View file

@ -69,8 +69,10 @@ module ApplicationHelper
def smart_annotation_notification(options = {}) def smart_annotation_notification(options = {})
title = options.fetch(:title) { :title_must_be_present } title = options.fetch(:title) { :title_must_be_present }
message = options.fetch(:message) { :message_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] || '' old_text = options[:old_text] || ''
new_text = options[:new_text]
return if new_text.blank?
sa_user = /\[\@(.*?)~([0-9a-zA-Z]+)\]/ sa_user = /\[\@(.*?)~([0-9a-zA-Z]+)\]/
# fetch user ids from the previous text # fetch user ids from the previous text
old_user_ids = [] old_user_ids = []

7
app/models/tiny_mce_asset.rb
View file

@ -22,12 +22,9 @@ class TinyMceAsset < ApplicationRecord
validates :estimated_size, presence: true validates :estimated_size, presence: true
def self.update_images(object, images, current_user) 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 # image ids that are present in text
text_images = text_images = text_field.scan(/data-mce-token="([^"]+)"/).flatten
object.public_send(Extends::RICH_TEXT_FIELD_MAPPINGS[object.class.name])
.scan(/data-mce-token="([^"]+)"/)
.flatten
images = JSON.parse(images) + text_images images = JSON.parse(images) + text_images
current_images = object.tiny_mce_assets.pluck(:id) current_images = object.tiny_mce_assets.pluck(:id)