Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/concerns/admins/render_helper.rb

@@ -1,36 +1,34 @@
 module Admins::RenderHelper
   extend ActiveSupport::Concern
 
+  def render_by_format(hash)
+    format = request.format.symbol
+    hash.key?(format) ? hash[format].call : hash[:html].call
+  end
+
   def render_forbidden
-    respond_to do |format|
+    render_by_format(html: -> { redirect_to '/403' },
-      format.html { redirect_to '/403' }
+                     json: -> { render status: 403, json: { messages: I18n.t('error.forbidden') } } )
-      format.json { super }
-    end
   end
 
   def render_not_found
-    respond_to do |format|
+    render_by_format(html: -> { render 'admins/shared/404' },
-      format.html { render 'admins/shared/404' }
+                     js: -> { render_js_error('资源未找到') },
-      format.js { render_js_error('资源未找到') }
+                     json: -> { render status: 404, json: { message: '资源未找到' } })
-      format.json { render status: 404, json: { message: '资源未找到' } }
-    end
   end
 
   def render_unprocessable_entity(message)
-    respond_to do |format|
+    render_by_format(html: -> { render 'admins/shared/422' },
-      format.html { render 'admins/shared/422' }
+                     js: -> { render_js_error(message) },
-      format.js { render_js_error(message) }
+                     json: -> { render status: 422, json: { message: message } })
-      format.json { render status: 422, json: { message: message } }
-    end
   end
   alias_method :render_error, :render_unprocessable_entity
 
   def internal_server_error(message = '系统错误')
-    respond_to do |format|
+    @message = message
-      format.html { render partail: 'admins/shared/500', locals: { message: message } }
+    render_by_format(html: -> { render 'admins/shared/500' },
-      format.js { render_js_error(message) }
+                     js: -> { render_js_error(message) },
-      format.json { render status: 500, json: { message: message } }
+                     json: -> { render status: 500, json: { message: message } })
-    end
   end
 
   def render_js_template(template, **opts)

app/controllers/files_controller.rb

@@ -171,17 +171,18 @@ class FilesController < ApplicationController
     begin
       attachment_ids.each do |attachment_id|
         ori = Attachment.find_by_id(attachment_id)
-        @course.attachments.each do |att|
+        # 同一个资源可以多次发送到课堂
-          @exist = false
+        # @course.attachments.each do |att|
-          if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
+        #   @exist = false
-            att.created_on = Time.now
+        #   if att.id == ori.id || (!att.copy_from.nil? && !ori.copy_from.nil? && att.copy_from == ori.copy_from) || att.copy_from == ori.id || att.id == ori.copy_from
-            att.save
+        #     att.created_on = Time.now
-            @exist = true
+        #     att.save
-            break
+        #     @exist = true
-          end
+        #     break
-        end
+        #   end
-
+        # end
-        next if @exist
+        #
+        # next if @exist
         attach_copied_obj = ori.copy
         attach_copied_obj.container = @course
         attach_copied_obj.created_on = Time.now

app/views/admins/shared/500.html.erb

@@ -2,5 +2,5 @@
   <div class="global-error-code">
     <span>500</span>
   </div>
-  <div class="global-error-text"><%= message %></div>
+  <div class="global-error-text"><%= @message %></div>
 </div>