diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index c0b797c4c..198917000 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -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 diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index c7a2dd605..cf01a172f 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -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,必须要求用户绑定了邮箱 diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index 37598d856..f440a4f91 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -2,7 +2,7 @@ <% if @myshixun.shixun.try(:language) == "PHP/Web" %>
- " target="_blank" class="shixun-task-btn task-btn-orange mr15 mt8"> + 查看网页效果