scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 15:33:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1340 from okriuchykhin/ok_SCI_2793

Browse source 
Fix helpers to use with export all [SCI-2793]
This commit is contained in:
Alex Kriuchykhin 2018-10-25 16:55:39 +02:00 committed by GitHub
commit ababa0b157
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/application_helper.rb
View file

@ -133,7 +133,6 @@ module ApplicationHelper
match = el.match(sa_user) match = el.match(sa_user)
user = User.find_by_id(match[2].base62_decode) user = User.find_by_id(match[2].base62_decode)
next unless user next unless user
team ||= current_team
popover_for_user_name(user, team) popover_for_user_name(user, team)
end end
new_text new_text
@ -166,7 +165,7 @@ module ApplicationHelper
end end
user_name = user.full_name user_name = user.full_name
unless skip_user_status || user_still_in_team unless skip_user_status || user_still_in_team
user_name << " #{I18n.t('atwho.res.removed')}" user_name << " #{I18n.t('atwho.res.removed')}"
end end

3
app/helpers/tiny_mce_helper.rb
View file

@ -24,8 +24,7 @@ module TinyMceHelper
text.gsub(regex) do |el| text.gsub(regex) do |el|
match = el.match(regex) match = el.match(regex)
img = TinyMceAsset.find_by_id(match[1]) img = TinyMceAsset.find_by_id(match[1])
next unless img && img.team == current_team next unless img && check_image_permissions(obj, img)
next unless check_image_permissions(obj, img)
if pdf_export_ready if pdf_export_ready
report_image_asset_url(img, :tiny_mce_asset, 'tiny-mce-pdf-ready') report_image_asset_url(img, :tiny_mce_asset, 'tiny-mce-pdf-ready')
else else