Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/student_work_controller.rb

@@ -75,7 +75,7 @@ class StudentWorkController < ApplicationController
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
     @homework_commons = @course.homework_commons.order("created_at desc")
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
-    @is_evaluation = @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
+    @is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 2 && !@is_teacher #是不是匿评
     @show_all = false
 
     course_group = CourseGroup.find_by_id(@group) if @group
@@ -86,7 +86,7 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      if @is_teacher   #老师 || 超级管理员 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
@@ -106,7 +106,7 @@ class StudentWorkController < ApplicationController
         @stundet_works = []
       end
     else
-      if @is_teacher   #老师 || 超级管理员 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的

app/helpers/api_helper.rb

@@ -75,7 +75,7 @@ module ApiHelper
   # 学生获取课程作业的状态
   def get_homework_status homework
     homework_status = ""
-       if !homework.nil?
+       if homework
          if  homework.homework_type == 1 && homework.homework_detail_manual
            case homework.homework_detail_manual.comment_status
              when 1

app/helpers/application_helper.rb

@@ -2299,7 +2299,7 @@ module ApplicationHelper
   def homework_anonymous_comment homework
     if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
-    elsif homework.student_works.count >= 2 #作业份数大于2
+    elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
       when 1
         link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
@@ -2309,7 +2309,7 @@ module ApplicationHelper
         # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
     else
-      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "学生提交作业数大于2时才可以启动匿评"
+      link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "学生提交作业数大于等于2时才可以启动匿评"
     end
     link
   end

app/helpers/users_helper.rb

@@ -582,7 +582,7 @@ module UsersHelper
     option << "请选择发布作业的课程"
     option << -1
     type << option
-    user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
+    user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
       option = []
       option << course.name+"（"+course.time.to_s+course.term+"）"
       option << course.id

app/views/users/_user_homework_list.html.erb

@@ -14,6 +14,8 @@
           <span class="homepagePostTitle hidden m_w530 fl">
             <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
           </span>
+
+          <% if homework_common.homework_detail_manual%>
             <% if homework_common.homework_detail_manual.comment_status == 1%>
               <span class="grey_btn_cir ml10">未开启匿评</span>
             <% elsif homework_common.homework_detail_manual.comment_status == 2%>
@@ -21,6 +23,7 @@
             <% elsif homework_common.homework_detail_manual.comment_status == 3%>
               <span class="grey_btn_cir ml10">匿评已结束</span>
             <% end%>
+          <% end%>
 
           <div class="homepagePostSubmitContainer">
             <div class="homepagePostSubmit">

app/views/users/search.html.erb

@@ -1,3 +1,8 @@
+<div id="wrapper">
+  <div id="wrapper2">
+    <div id="wrapper3">
+      <div id="main" class="nosidebar">
+        <div id="content_">
           <script type="text/javascript">
               function searchUser(){
                   var name = $("#name").val();
@@ -28,14 +33,6 @@
                     <td rowspan="2">
                     </td>
                     <td rowspan="2" >
-			<!--<div class="project-search" style="float: right">-->
-              <!--&lt;!&ndash;label for="user_browse_label"><%#= l(:label_user_search_type) %></label&ndash;&gt;-->
-              <!--<%#= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]],@search_by), :onchange => "searchByChange();",:style=>'display:none;' )  %>-->
-			  <!--<%#= text_field_tag 'name', params[:name], :size => 30, :placeholder=>'昵称/姓名/邮箱' %>-->
-              <!--<input type="text" name="search_by_input" hidden="hidden;" id="search_by_input" value="0">-->
-            <!--<input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>-->
-			<!--<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>-->
-			<!--</div>			-->
                     </td>
                   </tr>
                   <tr>
@@ -52,43 +49,22 @@
             <div class="autoscroll">
               <% if @users.size > 0 %>
                   <%= render :partial => 'user_show' %>
-
-	  <!--
-          <%# @users.each do |user| -%>
-            <%# unless user.id == 1%>
-                <div class="well">
-                    <%#= content_tag "p", "#{format_date(user.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
-                    <%#= image_tag "/images/time_member.png", :class => "img_member_time"%>
-                    <div>
-                        <%#= image_tag(url_to_avatar(user), :class => 'avatar')  %>
-                        <%#= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
-                    </div>
-                    <div style="margin-top: 20px;margin-left:66px">
-                        <%#= l(:label_has_fans,:count=>user.watcher_users.count)%>
-                        <%#= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
-                    </div>
-
-                    <div class="user-bottom">
-                        <%# unless user.memberships.empty? %>
-                            <%#= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %>
-                        <%# for member in user.memberships %>
-                            <%#= link_to_project(member.project) %><%#= (user.memberships.last == member) ? '' : '，' %>
-                        <%# end %>
-                        <%# end %>
-                        <%#= user.changesets.count == 0 ? '' : ",#{l(:label_total_commit, :total_commit => user.changesets.count)}" %>
-                    </div>
-                </div>
-            <%# end -%>
-           <%# end -%>
-	   -->
               <% else %>
                   <%= render :partial => "layouts/no_content"%>
               <% end %>
-</div>
+              <div class="cl"></div>
               <div class="pagination">
-	<ul>
+                <ul style="float: left;margin-bottom: 10px;margin-left: 10px;">
                   <%= pagination_links_full @user_pages, @user_count %>
                 </ul>
               </div>
+              <div class="cl"></div>
+            </div>
             <% html_title(l(:label_user_plural)) -%>
+            <div class="cl"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 

public/javascripts/homework.js

@@ -115,7 +115,7 @@ $(function(){
             minWidth: 753
     });
 
-    $('a.ProBtn').on('click', function(){
+    $('a.ProBtn').live('click', function(){
         $("#BluePopupBox").dialog("open");
         $(".ui-dialog-titlebar").hide();
         $("a.CloseBtn").on('click', function(){
@@ -173,7 +173,7 @@ $(function(){
         return valid;
     }
 
-    $("#BluePopupBox a.BlueCirBtn").on('click', function(){
+    $("#BluePopupBox a.BlueCirBtn").live('click', function(){
         if(saveProgramAnswers()){
             if($( "#BluePopupBox" ).dialog( "isOpen" )){
                 $("#BluePopupBox").dialog( "close" );