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

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
daiao 2017-09-01 19:21:16 +08:00
parent 888bd440e2 1775922c5b
commit 71c34557e5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/my_controller.rb
View File

@ -149,12 +149,12 @@ class MyController < ApplicationController
# 认证
ue = @user.user_extensions
#@trail_authentication = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization").order("created_at desc").first
@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?
@require_auth = true
else
if User.current.certification != 1
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))
@require_trail_auth = true
end
end

2
app/views/messages/_course_new.html.erb
View File

@ -3,7 +3,7 @@
<i class="fa fa-map-marker mr5 color-grey"></i>
<%= link_to User.current.show_real_name, user_path(User.current) %> &gt;
<%= link_to "在线课堂", courses_path() %> &gt;
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => "课程" %> &gt; <%= link_to @course.name, course_path(@course), :title => "班级" %> &gt; <%= link_to "讨论区列表", course_boards_path(@course) %> &gt; <span>新建</span>
<%= link_to @course.name, course_path(@course), :title => "班级" %> &gt; <%= link_to "讨论区列表", course_boards_path(@course) %> &gt; <span>新建</span>
</p>
<div class="edu-con-top">

2
app/views/messages/edit.html.erb
View File

@ -17,7 +17,7 @@
<i class="fa fa-map-marker mr5 color-grey"></i>
<%= link_to User.current.show_real_name, user_path(User.current) %> &gt;
<%= link_to "在线课堂", courses_path() %> &gt;
<%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => "课程" %> &gt; <%= link_to @course.name, course_path(@course), :title => "班级" %> &gt; <%= link_to "讨论区列表", course_boards_path(@course) %>
<%= link_to @course.name, course_path(@course), :title => "班级" %> &gt; <%= link_to "讨论区列表", course_boards_path(@course) %>
</p>
<div class="edu-con-top">