scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-10 06:37:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1620 from urbanrotnik/ur-sci-3245-activity-error-when-delete-result

Browse source 
Fix showing result icon when result is deleted [SCI-3245]
This commit is contained in:
Urban Rotnik 2019-04-01 14:25:19 +02:00 committed by GitHub
commit 213226fba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/helpers/results_helper.rb
View file

@ -1,11 +1,13 @@
# frozen_string_literal: true
module ResultsHelper
def published_text_for_result(result)
if result.is_text
t("my_modules.results.published_text", timestamp: l(result.created_at, format: :full))
t('my_modules.results.published_text', timestamp: l(result.created_at, format: :full))
elsif result.is_table
t("my_modules.results.published_table", timestamp: l(result.created_at, format: :full))
t('my_modules.results.published_table', timestamp: l(result.created_at, format: :full))
elsif result.is_asset
t("my_modules.results.published_asset", timestamp: l(result.created_at, format: :full))
t('my_modules.results.published_asset', timestamp: l(result.created_at, format: :full))
end
end
@ -31,23 +33,26 @@ module ResultsHelper
def edit_result_button_class(result)
if result.is_asset
"edit-result-asset"
'edit-result-asset'
elsif result.is_text
"edit-result-text"
'edit-result-text'
elsif result.is_table
"edit-result-table"
'edit-result-table'
end
end
def result_icon_class(result)
return 'fas fa-table' unless result
if result.is_asset
"fas fa-paperclip"
'fas fa-paperclip'
elsif result.is_text
"fas fa-font"
'fas fa-font'
elsif result.is_table
"fas fa-table"
'fas fa-table'
else
# just return table for any other result
"fas fa-table"
'fas fa-table'
end
end
end