Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/ecs/subitem_support_standards_controller.rb

@@ -4,7 +4,7 @@ class Ecs::SubitemSupportStandardsController < Ecs::BaseController
 
   def show
     @graduation_standards = EcGraduationStandard.all
-    @graduation_subitems = current_year.ec_graduation_subitems
+    @graduation_subitems = current_year.ec_graduation_subitems.includes(:ec_graduation_requirement)
 
     ids = @graduation_subitems.map(&:id)
     @subitem_support_standards = EcRequireSubVsStandard.where(ec_graduation_subitem_id: ids, status: true)
@@ -36,18 +36,18 @@ class Ecs::SubitemSupportStandardsController < Ecs::BaseController
   private
 
   def check_record_exists!
-    unless current_year.ec_graduation_subitems.exists?(id: params[:graduation_subitem_id])
+    unless current_year.ec_graduation_subitems.exists?(id: params[:ec_graduation_subitem_id])
       render_not_found
       return
     end
 
-    unless EcGraduationStandard.exists?(id: params[:graduation_standard_id])
+    unless EcGraduationStandard.exists?(id: params[:ec_graduation_standard_id])
       render_not_found
       return
     end
   end
 
   def permit_params
-    params.require(%i[graduation_subitem_id graduation_standard_id])
+    params.permit(%i[ec_graduation_subitem_id ec_graduation_standard_id])
   end
 end

app/controllers/graduation_tasks_controller.rb

@@ -360,7 +360,7 @@ class GraduationTasksController < ApplicationController
 
         tasks.each do |task|
           task.end_time = Time.now
-          task.status = task.allow_late ? 2 : 3
+          task.status = 2
           task.save!
         end
         normal_status(0, "更新成功")

app/services/admins/update_user_service.rb

@@ -10,6 +10,8 @@ class Admins::UpdateUserService < ApplicationService
 
   def call
     user.assign_attributes(user_attributes)
+    user.mail = params[:mail].to_s.presence
+    user.phone = params[:phone].to_s.presence
     user.firstname = ''
     user.password = params[:password] if params[:password].present?
 

app/views/admins/users/edit.html.erb

@@ -74,7 +74,7 @@
 
       <div class="form-row">
         <%= f.input :mail, as: :email, label: '邮箱地址', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
-        <%= f.input :phone, as: :tel, label: '手机号', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
+        <%= f.input :phone, as: :tel, label: '手机号', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'off' } %>
       </div>
 
       <div class="form-row province-city-select">
@@ -124,8 +124,8 @@
       </div>
 
       <div class="form-row">
-        <%= f.input :password, as: :password, label: '修改密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
-        <%= f.input :password_confirmation, as: :password, label: '确认密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
+        <%= f.input :password, as: :password, label: '修改密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'new-password' } %>
+        <%= f.input :password_confirmation, as: :password, label: '确认密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'new-password' } %>
       </div>
     </div>
 

app/views/ecs/subitem_support_standards/show.json.jbuilder

@@ -1,4 +1,9 @@
 
 json.graduation_standards @graduation_standards, partial: 'ecs/shared/ec_graduation_standard', as: :ec_graduation_standard
-json.graduation_subitems @graduation_subitems, partial: 'ecs/shared/ec_graduation_subitem', as: :ec_graduation_subitem
+json.graduation_subitems do
+  json.array! @graduation_subitems do |graduation_subitem|
+    json.partial! 'ecs/shared/ec_graduation_subitem', ec_graduation_subitem: graduation_subitem
+    json.graduation_requirement_position graduation_subitem.ec_graduation_requirement.position
+  end
+end
 json.subitem_support_standards @subitem_support_standards, partial: 'ecs/subitem_support_standards/shared/subitem_support_standard', as: :subitem_support_standard