Revert "#1353 doc preview"
This reverts commit 6f8d73ab8bb8dd3acfd0aee15474f287e4e1126b.
This commit is contained in:
parent
6f8d73ab8b
commit
b1ce56a0e6
@ -132,7 +132,6 @@ class DmsfUploadController < ApplicationController
|
|||||||
|
|
||||||
def commit_files_internal(commited_files)
|
def commit_files_internal(commited_files)
|
||||||
@files, failed_uploads = DmsfUploadHelper.commit_files_internal(commited_files, @project, @folder, self)
|
@files, failed_uploads = DmsfUploadHelper.commit_files_internal(commited_files, @project, @folder, self)
|
||||||
call_hook(:dmsf_upload_controller_after_commit, { files: @files })
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.js
|
format.js
|
||||||
format.api { render_validation_errors(failed_uploads) unless failed_uploads.empty? }
|
format.api { render_validation_errors(failed_uploads) unless failed_uploads.empty? }
|
||||||
|
|||||||
@ -524,7 +524,7 @@ class DmsfFile < ActiveRecord::Base
|
|||||||
RedmineDmsf::Preview.generate last_revision&.disk_file.to_s, target
|
RedmineDmsf::Preview.generate last_revision&.disk_file.to_s, target
|
||||||
rescue => e
|
rescue => e
|
||||||
Rails.logger.error "An error occurred while generating preview for #{last_revision&.disk_file} to #{target}\nException was: #{e.message}"
|
Rails.logger.error "An error occurred while generating preview for #{last_revision&.disk_file} to #{target}\nException was: #{e.message}"
|
||||||
''
|
nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -130,7 +130,3 @@
|
|||||||
});
|
});
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% late_javascript_tag do %>
|
|
||||||
"$('#ajax-indicator').hide();"
|
|
||||||
<% end %>
|
|
||||||
|
|||||||
@ -45,8 +45,7 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<div class="form-actions">
|
<div class="form-actions">
|
||||||
<%= submit_tag l(:label_upload), class: 'button-positive',
|
<%= submit_tag l(:label_upload), class: 'button-positive' %>
|
||||||
onclick: "$('#ajax-indicator').show();" %>
|
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@ -1,38 +0,0 @@
|
|||||||
diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb
|
|
||||||
index b2590f2..2515b47 100644
|
|
||||||
--- a/app/controllers/dmsf_upload_controller.rb
|
|
||||||
+++ b/app/controllers/dmsf_upload_controller.rb
|
|
||||||
@@ -132,6 +132,7 @@ class DmsfUploadController < ApplicationController
|
|
||||||
|
|
||||||
def commit_files_internal(commited_files)
|
|
||||||
@files, failed_uploads = DmsfUploadHelper.commit_files_internal(commited_files, @project, @folder, self)
|
|
||||||
+ call_hook(:dmsf_upload_controller_after_commit, { files: @files })
|
|
||||||
respond_to do |format|
|
|
||||||
format.js
|
|
||||||
format.api { render_validation_errors(failed_uploads) unless failed_uploads.empty? }
|
|
||||||
diff --git a/app/views/dmsf/_main.html.erb b/app/views/dmsf/_main.html.erb
|
|
||||||
index 923748c..2f32e0c 100644
|
|
||||||
--- a/app/views/dmsf/_main.html.erb
|
|
||||||
+++ b/app/views/dmsf/_main.html.erb
|
|
||||||
@@ -130,3 +130,7 @@
|
|
||||||
});
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
+
|
|
||||||
+<% late_javascript_tag do %>
|
|
||||||
+ "$('#ajax-indicator').hide();"
|
|
||||||
+<% end %>
|
|
||||||
diff --git a/app/views/dmsf_upload/upload_files.html.erb b/app/views/dmsf_upload/upload_files.html.erb
|
|
||||||
index 7af5684..d0a7dfc 100644
|
|
||||||
--- a/app/views/dmsf_upload/upload_files.html.erb
|
|
||||||
+++ b/app/views/dmsf_upload/upload_files.html.erb
|
|
||||||
@@ -45,7 +45,8 @@
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
<div class="form-actions">
|
|
||||||
- <%= submit_tag l(:label_upload), class: 'button-positive' %>
|
|
||||||
+ <%= submit_tag l(:label_upload), class: 'button-positive',
|
|
||||||
+ onclick: "$('#ajax-indicator').show();" %>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
Loading…
x
Reference in New Issue
Block a user