Hjqreturn
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上线缺陷修复

This commit is contained in:
daiao 2017-09-01 19:55:11 +08:00
parent 71c34557e5
commit ec9e28a4ad
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/my_controller.rb
View File

@ -151,7 +151,7 @@ class MyController < ApplicationController
ue = @user.user_extensions
@trail_authentication = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization").order("created_at desc").first
@authentication = @user.authentication
if @user.nickname.nil? || @user.lastname.nil? || ue.identity.nil? || ue.location.nil? || ue.school_id.nil?
if @user.nickname.nil? || @user.lastname.nil? || ue.try(:identity).nil? || ue.try(:location).nil? || ue.try(:location).nil?
@require_auth = true
else
if User.current.certification != 1 && (@trail_authentication.blank? || (@trail_authentication.status == 2 && (@trail_authentication.updated_at.to_i + 24*60*60) < Time.now.to_i))

2
app/views/layouts/base_edu_account.html.erb
View File

@ -42,7 +42,7 @@
<div class="alert alert-orange mb15 mt15" style="width: 1180px; margin:20px auto;">
试用申请已提交，我们将在一个工作日内完成审核
</div>
<% elsif @trail_authentication.status == 2 && (@trail_authentication.updated_at.to_i + 24*60*60) > Time.now.to_i %>
<% elsif User.current.certification == 2 || (@trail_authentication.status == 2 && (@trail_authentication.updated_at.to_i + 24*60*60) > Time.now.to_i) %>
<div class="alert alert-orange mb15 mt15" style="width: 1180px; margin:20px auto;">
您的试用申请已被拒绝，原因：<%= @trail_authentication.reason %>，请于24小时后重新申请
</div>