scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3432 from biosistemika/july2021-local-rc

Browse source 
July 1.22.1 local release
This commit is contained in:
Miha Mencin 2021-07-13 10:45:41 +02:00 committed by GitHub
commit 7a00adea5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.22.0
1.22.1

6
app/models/asset.rb
View file

@ -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

3
app/views/my_modules/archive.html.erb
View file

@ -21,3 +21,6 @@
<% end %>
</div>
</div>
<%= javascript_pack_tag 'pdfjs/pdf_js' %>
<%= stylesheet_pack_tag 'pdfjs/pdf_js_styles' %>