From 0fbe45252fd3dfe4ee4443aaaae1b791d18746f3 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Wed, 7 Jul 2021 14:57:35 +0200
Subject: [PATCH 1/3] Reset file_processing when new file is upladed [SCI-5870]

---
 app/models/asset.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/models/asset.rb b/app/models/asset.rb
index 6dd6c63b7..71f65d9b4 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -57,6 +57,8 @@ class Asset < ApplicationRecord
 
   attr_accessor :file_content, :file_info, :in_template
 
+  before_save :reset_file_processing, if: -> { file.new_record? }
+
   def self.search(
     user,
     include_archived,
@@ -495,4 +497,8 @@ class Asset < ApplicationRecord
       end
     end
   end
+
+  def reset_file_processing
+    self.file_processing = false
+  end
 end

From 249b21808a71131857058a1f43cc99d0855cc9c5 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Wed, 7 Jul 2021 11:34:28 +0200
Subject: [PATCH 2/3] Added pdf viewer js pack to my_module archive view
 [SCI-5870]

---
 app/views/my_modules/archive.html.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/my_modules/archive.html.erb b/app/views/my_modules/archive.html.erb
index 12fcd357b..13539ba79 100644
--- a/app/views/my_modules/archive.html.erb
+++ b/app/views/my_modules/archive.html.erb
@@ -21,3 +21,6 @@
     <% end %>
   </div>
 </div>
+
+<%= javascript_pack_tag 'pdfjs/pdf_js' %>
+<%= stylesheet_pack_tag 'pdfjs/pdf_js_styles' %>

From 6f245274be028ea0919d89bc7dd34ff216c4baaa Mon Sep 17 00:00:00 2001
From: miha <miha.mencin@gmail.com>
Date: Tue, 13 Jul 2021 10:42:08 +0200
Subject: [PATCH 3/3] Bump version to 1.22.1

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 57807d6d0..6245beecd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.22.0
+1.22.1