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

app/controllers/files_controller.rb

@@ -210,6 +210,7 @@ class FilesController < ApplicationController
 
     is_unified_setting = params[:is_unified_setting]
     publish_time = params[:publish_time]
+    publish_time = format_time(Time.parse(publish_time)) unless publish_time.blank?
     is_public = params[:is_public]
     course_group_publish_times = params[:course_group_publish_times] || []
 
@@ -221,8 +222,10 @@ class FilesController < ApplicationController
         @new_attachment_history = @old_attachment.become_history
         @new_attachment_history.save!
 
+        old_course_second_category_id = @old_attachment.course_second_category_id
         @old_attachment.copy_attributes_from_new_attachment(@new_attachment)
         @old_attachment.is_public = is_public == true ? 1 : 0 if is_public
+        @old_attachment.course_second_category_id = old_course_second_category_id
         @old_attachment.save!
         @new_attachment.delete
       end

lib/tasks/public_course.rake

@@ -102,7 +102,7 @@ namespace :public_course do
       course.attachments.each do |atta|
         created_on = random_time start_time, end_time
 
-        atta.update_columns(is_publish: 1, created_on: created_on)
+        atta.update_columns(is_publish: 1, created_on: created_on, publish_time: created_on)
       end
     end