@@ -67,13 +68,14 @@
diff --git a/app/serializers/asset_serializer.rb b/app/serializers/asset_serializer.rb
index 667b2ba19..6ce5635de 100644
--- a/app/serializers/asset_serializer.rb
+++ b/app/serializers/asset_serializer.rb
@@ -3,6 +3,7 @@
class AssetSerializer < ActiveModel::Serializer
include Canaid::Helpers::PermissionsHelper
include Rails.application.routes.url_helpers
+ include Webpacker::Helper
include FileIconsHelper
include ActionView::Helpers::NumberHelper
include ApplicationHelper
@@ -10,7 +11,7 @@ class AssetSerializer < ActiveModel::Serializer
attributes :file_name, :view_mode, :icon, :urls, :updated_at_formatted,
:file_size, :medium_preview, :large_preview, :asset_type, :wopi,
:wopi_context, :pdf_previewable, :file_size_formatted, :asset_order,
- :updated_at, :metadata, :image_editable, :image_context
+ :updated_at, :metadata, :image_editable, :image_context, :pdf
def icon
file_fa_icon_class(object)
@@ -68,6 +69,16 @@ class AssetSerializer < ActiveModel::Serializer
object.pdf_previewable? if object.file.attached?
end
+ def pdf
+ return unless asset.pdf?
+
+ {
+ url: object.pdf? ? asset_download_path(object) : asset_pdf_preview_path(object),
+ size: !object.pdf? && object.pdf_preview_ready? ? object.file_pdf_preview&.blob&.byte_size : object.file_size,
+ worker_url: asset_pack_path('pdfjs/pdf_js_worker.js')
+ }
+ end
+
def image_editable
object.editable_image?
end
diff --git a/app/utilities/protocols_importer.rb b/app/utilities/protocols_importer.rb
index c4b2a9199..bf8215762 100644
--- a/app/utilities/protocols_importer.rb
+++ b/app/utilities/protocols_importer.rb
@@ -62,6 +62,7 @@ class ProtocolsImporter
def populate_protocol(protocol, protocol_json)
protocol.reload
protocol.description = populate_rte(protocol_json, protocol)
+ protocol.name = protocol_json['name'].presence
protocol.save!
asset_ids = []
step_pos = 0
diff --git a/app/utilities/protocols_importer_v2.rb b/app/utilities/protocols_importer_v2.rb
index d7dadbc0d..1d236b6f3 100644
--- a/app/utilities/protocols_importer_v2.rb
+++ b/app/utilities/protocols_importer_v2.rb
@@ -61,9 +61,11 @@ class ProtocolsImporterV2
def populate_protocol(protocol, protocol_json)
protocol.reload
protocol.description = populate_rte(protocol_json, protocol)
+ protocol.name = protocol_json['name'].presence
protocol.save!
asset_ids = []
step_pos = 0
+
# Check if protocol has steps
protocol_json['steps']&.values&.each do |step_json|
step = Step.create!(
diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb
index 1bde709c5..d6bdb5978 100644
--- a/app/views/shared/_secondary_navigation.html.erb
+++ b/app/views/shared/_secondary_navigation.html.erb
@@ -72,7 +72,7 @@
<%=t "nav2.modules.results" %>
<% @active_results_size = @my_module.results.where(archived:false).size %>
<% if @active_results_size.positive? %>
- <%= @active_results_size %>
+ <%= @my_module.archived_branch? ? @my_module.results.size : @active_results_size %>
<% end %>