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

Merge pull request #6185 from ivanscinote/SCI-9250-fix-shared-task-with-new-results

Browse source 
Fixed shared task to work with new results [SCI-9250]
This commit is contained in:
Martin Artnik 2023-09-13 13:43:30 +02:00 • committed by GitHub
commit cb28c4d566
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/my_modules/results/index.scss
View file

@ -68,10 +68,6 @@
}
.result {
.panel {
margin-left: 4.25em !important;
}
.ql-editor {
overflow-x: auto;
}

1
app/assets/stylesheets/steps/components/text.scss
View file

@ -1,5 +1,4 @@
.step-text-container {
display: flex;
border-radius: 4px;
margin-bottom: 16px;
padding-left: var(--left-component-padding);

4
app/assets/stylesheets/themes/scinote.scss
View file

@ -1004,10 +1004,6 @@ ul.content-activities {
.step,
.result {
.panel {
margin-left: 38px;
}
.result-panel-collapse-link {
text-decoration: none;

2
app/controllers/my_module_shareable_links_controller.rb
View file

@ -56,7 +56,7 @@ class MyModuleShareableLinksController < ApplicationController
else @results.order(created_at: :desc)
end
@gallery = @results.left_joins(:asset).pluck('assets.id').compact
@gallery = @results.left_joins(:assets).pluck('assets.id').compact
render 'shareable_links/my_module_results_show', layout: 'shareable_links'
end

31
app/views/shareable_links/my_modules/results/_result.html.erb
View file

@ -1,13 +1,4 @@
<div class="result">
<div class="result-icon">
<% if result.is_text %>
<span class="sn-icon sn-icon-result-text"></span>
<% elsif result.is_table %>
<span class="sn-icon sn-icon-tables"></span>
<% elsif result.is_asset %>
<span class="sn-icon sn-icon-files"></span>
<% end %>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-options pull-right">
@ -22,19 +13,15 @@
<div class="panel-body">
<div class="row">
<div class="col-xs-12">
<% if result.is_text %>
<div class="ql-editor">
<%= smart_annotation_text(result.result_text.shareable_tinymce_render(:text)) %>
</div>
<% elsif result.is_table %>
<div class="hot-table">
<input type="hidden" class="hot-table-contents" value="<%= result.table.contents_utf_8 %>" />
<input type="hidden" class="hot-table-metadata" value="<%= result.table.metadata ? result.table.metadata.to_json : nil %>" />
<div class="hot-table-container"></div>
</div>
<% elsif result.is_asset %>
<%= render partial: "shareable_links/my_modules/step_attachments/#{ result.asset.view_mode }", locals: { asset: result.asset } %>
<%= render partial: "shareable_links/my_modules/step_attachments/file_preview", locals: { asset: result.asset, gallery: gallery } %>
<% result.result_orderable_elements.sort_by(&:position).each do |element| %>
<% if element.orderable_type == 'ResultText' %>
<%= render partial: "shareable_links/my_modules/step_elements/text", locals: { element: element.orderable } %>
<% elsif element.orderable_type == 'ResultTable'%>
<%= render partial: "shareable_links/my_modules/step_elements/table", locals: { element: element.orderable.table } %>
<% end %>
<% end %>
<% if result.result_assets.present? %>
<%= render partial: "shareable_links/my_modules/attachments", locals: { attachments: result.assets, step: result } %>
<% end %>
</div>
</div>

1
app/views/shareable_links/my_modules/step_elements/_table.html.erb
View file

@ -1,6 +1,5 @@
<div class="step-table-container">
<div class="step-element-header step-element--locked">
<div class="step-element-grip-placeholder"></div>
<% if element.name.present? %>
<div class="step-element-name">
<%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: false } %>

8
app/views/shareable_links/my_modules/step_elements/_text.html.erb
View file

@ -1,5 +1,11 @@
<div class="step-text-container step-element--locked locked" tabindex="0">
<div class="step-element-grip-placeholder"></div>
<% if element.name.present? %>
<div class="step-element-header step-element--locked mt-4">
<div class="step-element-name">
<%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: false } %>
</div>
</div>
<% end %>
<% if element.text.present? %>
<div class="view-text-element">
<%= smart_annotation_text(element.shareable_tinymce_render(:text)) %>