Merge branch 'develop' into dev_aliyun

app/controllers/files_controller.rb

@@ -47,26 +47,26 @@ class FilesController < ApplicationController
 
   def bulk_publish
     return normal_status(403, "您没有权限进行操作") if current_user.course_identity(@course) >= 5
-    tip_exception("请至少选择一个分班") if params[:group_ids].blank? && @course.course_groups.size != 0
+    # tip_exception("请至少选择一个分班") if params[:group_ids].blank? && @course.course_groups.size != 0
 
     attachments = @course.attachments.by_ids(@attachment_ids)
 
     ActiveRecord::Base.transaction do
       # 有分班设置时
-      if @course.course_group_module? && @course.course_groups_count != 0 && params[:group_ids]
-        group_ids = params[:group_ids]&.reject(&:blank?)
-        charge_group_ids = @course.charge_group_ids(current_user)
-        publish_groups = charge_group_ids & group_ids if group_ids
-
-        attachments.each do |atta|
-          if atta.published? && !atta.unified_setting || !atta.published?
-            create_atta_group_settings atta
-            atta.update_all(unified_setting: 0) if atta.unified_setting
-            none_publish_settings = atta.attachment_group_settings.where(course_group_id: publish_groups).none_published
-            none_publish_settings.update_all(publish_time: Time.now)
-          end
-        end
-      end
+      # if @course.course_group_module? && @course.course_groups_count != 0 && params[:group_ids]
+      #   group_ids = params[:group_ids]&.reject(&:blank?)
+      #   charge_group_ids = @course.charge_group_ids(current_user)
+      #   publish_groups = charge_group_ids & group_ids if group_ids
+      #
+      #   attachments.each do |atta|
+      #     if atta.published? && !atta.unified_setting || !atta.published?
+      #       create_atta_group_settings atta
+      #       atta.update_attributes!(unified_setting: 0) if atta.unified_setting
+      #       none_publish_settings = atta.attachment_group_settings.where(course_group_id: publish_groups).none_published
+      #       none_publish_settings.update_all(publish_time: Time.now)
+      #     end
+      #   end
+      # end
 
       # 未发布的资源更新状态
       attachments.where(is_publish: 0).update_all(is_publish: 1, publish_time: Time.now)

public/react/src/modules/courses/coursesPublic/sendResource.js

@@ -402,28 +402,25 @@ class Sendresource extends Component{
 								<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""}>
 									<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
 										<span className={"mr5"}>延期发布</span>
-										{this.props.course_groups.length===0?
-											<DatePicker
-												dropdownClassName="hideDisable"
-												showTime={{ format: 'HH:mm' }}
-												locale={locale}
-												format={dateFormat}
-												placeholder="请选择发布时间"
-												id={"startime"}
-												showToday={false}
-												width={"210px"}
-												value={this.state.Radiovalue===1?datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat):undefined}
-												onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
-												disabledTime={disabledDateTime}
-												disabledDate={disabledDate}
-												disabled={this.state.Radiovalue===1?false:true}
-											/>:""}
+										<DatePicker
+
+											dropdownClassName="hideDisable"
+											showTime={{ format: 'HH:mm' }}
+											locale={locale}
+											format={dateFormat}
+											placeholder="请选择发布时间"
+											id={"startime"}
+											showToday={false}
+											width={"210px"}
+											value={this.state.Radiovalue===1?datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat):undefined}
+											onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
+											disabledTime={disabledDateTime}
+											disabledDate={disabledDate}
+											disabled={this.state.Radiovalue===1?false:true}
+										/>
 									</Radio>
 								</Tooltip>
 								<span className={"fl mt5 color-grey-c"}>(按照设置的时间定时发布)</span>
-
-
-
 							</Radio.Group>
 						</div>