caishi
/
trustieplus
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:
caishi 2017-10-14 10:31:35 +08:00
parent 5bb78aeb80 321414b2cc
commit 3e5194fcd8
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/managements_controller.rb
View File

@ -889,10 +889,10 @@ end
user_id = User.where("concat(lastname, firstname) like '%#{search}%'")
@courselist = @courselist.includes(:user).where("concat(users.lastname, users.firstname) like '%#{search}%'")
else
@courselist= @courselist.where("name like '%#{search}%'")
@courselist = @courselist.where("name like '%#{search}%'")
end
end
@courselist = @courselist.order("id #{@sx_order}")
@courselist = @courselist.order("created_at #{@sx_order}")
@courselist_count = @courselist.count
limit = 20
@is_remote = true

2
app/controllers/shixuns_controller.rb
View File

@ -626,7 +626,7 @@ class ShixunsController < ApplicationController
user_gid = User.find_by_mail("eduforge@163.com").try(:gid)
gshixun = g.fork(@shixun.gpid, user_gid)
raise "版本库创建失败" if gshixun.try(:id).blank?
gshixun = g.edit_project(gshixun.id, new_shixun.identifier, new_shixun.identifier)
#gshixun = g.edit_project(gshixun.id, new_shixun.identifier, new_shixun.identifier)
raise "实训复制失败" if (gshixun.try(:name) != new_shixun.identifier || gshixun.try(:path) != new_shixun.identifier)
new_shixun.update_column(:gpid, gshixun.id)
# 同步复制者至gitlab,必须要求用户绑定了邮箱

2
app/views/games/_code_actions.html.erb
View File

@ -2,7 +2,7 @@
<!--<span class="mt10 mr15" style="color: #2dad96;" id="game_wating_time"></span>-->
<% if @myshixun.shixun.try(:language) == "PHP/Web" %>
<div id="php_display" class="undis">
<a href="<%= "http://106.75.96.108:" + (50000 + @game.myshixun_id).to_s + '/' + @game.challenge.path.strip %>" target="_blank" class="shixun-task-btn task-btn-orange mr15 mt8">
<a href="<%= Redmine::Configuration['tomcat_php'] + ':' + (50000 + @game.myshixun_id).to_s + '/' + @game.challenge.path.strip %>" target="_blank" class="shixun-task-btn task-btn-orange mr15 mt8">
查看网页效果
</a>
<!--

14
app/views/users/show.html.erb
View File

@ -3,12 +3,16 @@
<div class="-task-con">
<div class="-task-con-per box_bg_shandow bor-grey-e cl">
<div class="photo fl" onclick="window.open('<%=avatar_account_path%>')">
<%= image_tag(url_to_avatar(@user), :class => "person",:width => 100, :height => 100, :alt => "头像") %>
<% if current_user %>
<% if current_user %>
<div class="photo fl" onclick="window.open('<%=avatar_account_path%>')">
<%= image_tag(url_to_avatar(@user), :class => "person",:width => 100, :height => 100, :alt => "头像") %>
<div class="changephoto font-14"><a href="<%= avatar_account_path %>" class="subchange" style="display: block" target="_blank" >更换头像</a></div>
<% end %>
</div>
</div>
<% else %>
<div class="photo fl">
<%= image_tag(url_to_avatar(@user), :class => "person",:width => 100, :height => 100, :alt => "头像") %>
</div>
<% end %>
<div class="-task-con-data fl">
<div class="top cl">
<div class="top-left fl">

2
public/stylesheets/css/edu-class.css
View File

@ -326,7 +326,7 @@ img.ui-datepicker-trigger {display:block;background:url(../images/public_icon.pn
.edu-class-innner-conbox{ background:#fff;}
.edu-class-con-list{ padding:10px 0; border-bottom:1px solid #eee;}
.edu-class-con-list .edu-bg-grey{ background:#f5f5f5;}
a.edu-class-inner-list{display: block; color:#333; font-size: 16px; max-width:87%; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
a.edu-class-inner-list{display: block; color:#333; font-size: 16px; max-width:77%; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
a:hover.edu-class-inner-list{color:#FF7500!important;}
.popup_tip_box {position: absolute; padding: 5px 15px; display: inline-block;white-space: nowrap; background-color: #FFFEF4;border: 1px solid #F3DDB3; color:#888; font-size:12px;}
.popup_tip_box em { display: block; border-width: 9px; position: absolute; top: 5px; left: -18px;