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

app/controllers/games_controller.rb

@@ -22,6 +22,7 @@ class GamesController < ApplicationController
     myshixun_user_login = User.where(:id => @myshixun.user_id).first.try(:login)
     myshixun_rep_identifier = Repository.where(:myshixun_id => @myshixun.id, :type => "Repository::Gitlab").first.try(:identifier)
     gitlab_address = Redmine::Configuration['gitlab_address']
+    myshixun_domain = Redmine::Configuration['myshixun_domain']
     gitlab_myshixun_url = git_myshixun_url(@myshixun, @myshixun.try(:user_id))
     shixun = @myshixun.shixun
     gitlab_shixun_url = git_shixun_url(shixun, (shixun.try(:fork_from).blank? ? "educoder" : "eduforge"))
@@ -33,7 +34,7 @@ class GamesController < ApplicationController
     script = "cd #{path}
             git clone #{gitlab_address.to_s+'/'+myshixun_user_login+'/'+ myshixun_rep_identifier}.git
             cd #{myshixun_rep_identifier}/
-            git remote set-url origin https://#{shixun.fork_from.blank? ? "educoder" : "eduforge"}:xinhu1ji2qu3@testbdgit.trustie.net/#{myshixun_user_login}/#{myshixun_rep_identifier}.git
+            git remote set-url origin https://#{shixun.fork_from.blank? ? "educoder" : "eduforge"}:xinhu1ji2qu3@#{myshixun_domain}/#{myshixun_user_login}/#{myshixun_rep_identifier}.git
             git remote add remote_origin #{gitlab_shixun_url}
             #git pull
             git pull remote_origin master

app/controllers/managements_controller.rb

@@ -1532,7 +1532,7 @@ end
     @sub_type =  5
     @type = trial_authorization_status params[:type]
     # sql = select * from apply_actions where dealer_id is null
-    @authorizations = ApplyAction.where(:container_type => "ApplyShixun", :status => @type,:dealer_id =>'').order("created_at desc")
+    @authorizations = ApplyAction.where(:container_type => "ApplyShixun", :status => @type).order("created_at desc")
     search = params[:search]
     unless search.blank?
       @authorizations = @authorizations.where(:container_id => Shixun.where(:id => @authorizations.map(&:container_id)).where("name like '%#{search}%'").map(&:id)).order("created_at desc")

app/views/exercise/student_exercise_list.html.erb

@@ -17,7 +17,8 @@
 <div class="edu-con-top user_bg_shadow bor-grey-e clearfix mb20">
   <p class="ml15 fl color-grey3">
     <% unless @exercise.is_public %>
-        <i id="exercise_public_icon_<%= @exercise.id %>" class="fa fa-lock color-grey fl mt8 mr15 font-18"></i>    <% end %>
+        <i id="exercise_public_icon_<%= @exercise.id %>" class="fa fa-lock color-grey fl mt8 mr15 font-18"></i>
+    <% end %>
     <span><%= @exercise.exercise_name %></span>
   </p>
   <%= link_to "返回", exercise_index_path(:course_id => @course.id), :class => "fr font-12 mr15 mt3 color-grey" %>
@@ -42,8 +43,9 @@
               <%= link_to "导出成绩", student_exercise_list_exercise_path(@exercise, :course_id => @course.id, :format => 'xls'), :id => "export_exercise_work", :class => "fr white-btn orange-btn ml10 mt8" %>
               <div class="edu-find fr mr40 with20 pr">
                 <div class="edu-find-input">
-                  <input type="text" class="task-form-100 panel-box-sizing" maxlength="20" placeholder="姓名、学号关键字检索" value="<%= @name %>" id="student_user_name">
-                  <i class="fa fa-close mr5 color-grey edu-close" onclick="clear_searchbox();"></i>
+                  <input type="text" class="with100 panel-box-sizing" maxlength="20" placeholder="姓名、学号关键字检索" value="<%= @name %>" id="student_user_name">
+                  <!--<i class="fa fa-close mr5 color-grey edu-close" onclick="colse_searchbox();"></i>-->
+                  <span class="edu-close" onclick="clear_searchbox();" data-tip-down="关闭">×</span>
                 </div>
                 <a href="javascript:void(0);" onclick="SearchByName_ex();" class="edu-open font-16 color-grey "><i class="fa fa-search"></i></a>
               </div>

app/views/games/_games_list.html.erb

@@ -52,7 +52,7 @@
                 <% gold_score = @myshixun.shixun.status <= 1 ? 0 : (game.answer_open? ? -challenge.score.to_i : game.final_score.to_i) %>
                 <span class="color-dark-grey font-12 mr15 info-partly" id="shixun_exp_<%=challenge.id %>">经验值<span class="color-light-green ml5">+<%= final_score %></span></span>
                 <span class="color-dark-grey font-12 mr15 info-partly" id="shixun_grade_<%=challenge.id %>">金币<span class="<%= gold_score < 0 ? "u-color-light-red" : "color-light-green" %> ml5"><%= gold_score < 0 ? gold_score : "+"+gold_score.to_s %></span></span>
-                <span class="color-dark-grey font-12 mr15 info-partly" id="shixun_tag_<%=challenge.id %>">技能标签<span class="<%= (game.answer_open? || @myshixun.shixun.status <= 1) ? "color-grey" : "color-light-green" %> ml5"><%= (game.answer_open? || @myshixun.shixun.status <= 1) ? "无" : "+"+challenge.challenge_tags.count.to_s %></span></span>
+                <span class="color-dark-grey font-12 mr15 info-partly" id="shixun_tag_<%=challenge.id %>">技能标签<span class="<%= (game.answer_open? || @myshixun.shixun.status <= 1 || challenge.challenge_tags.count ==0 ) ? "color-grey" : "color-light-green" %> ml5"><%= (game.answer_open? || @myshixun.shixun.status <= 1 || challenge.challenge_tags.count ==0 ) ? "无" : "+"+challenge.challenge_tags.count.to_s %></span></span>
               <% end %>
             </div>
           </div>