Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/views/student_work/_evaluation_work.html.erb

app/controllers/account_controller.rb

@@ -21,7 +21,6 @@ class AccountController < ApplicationController
 
   # prevents login action to be filtered by check_if_login_required application scope filter
   skip_before_filter :check_if_login_required
-
   # Login request and validation
   def login
     if request.get?

app/controllers/application_controller.rb

@@ -663,7 +663,8 @@ class ApplicationController < ActionController::Base
     if api_request?
       logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)."
     end
-    render_error "Invalid form authenticity token."
+    #render_error "Invalid form authenticity token."
+    redirect_to signin_path(:login=>true)
   end
 
   def render_feed(items, options={})

app/controllers/files_controller.rb

@@ -332,6 +332,9 @@ class FilesController < ApplicationController
      #modify by nwb
      if @project
        @addTag=false
+       if params[:in_project_toolbar]
+         @in_project_toolbar = params[:in_project_toolbar]
+       end
        container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
        attachments = Attachment.attach_filesex(container, params[:attachments], params[:attachment_type])
        render_attachment_warning_if_needed(container)
@@ -363,6 +366,9 @@ class FilesController < ApplicationController
        end
      elsif @course
        @addTag=false
+       if params[:in_course_toolbar]
+         @in_course_toolbar =  params[:in_course_toolbar]
+       end
        attachments = Attachment.attach_filesex(@course, params[:attachments], params[:attachment_type])
 
        if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')

app/controllers/homework_common_controller.rb

@@ -147,6 +147,9 @@ class HomeworkCommonController < ApplicationController
     else
       @statue = 3
     end
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
   end
 
   #关闭匿评
@@ -162,6 +165,9 @@ class HomeworkCommonController < ApplicationController
     # 匿评关闭消息邮件通知
     send_message_anonymous_comment(@homework, m_status = 3)
     Mailer.send_mail_anonymous_comment_close(@homework).deliver
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
     respond_to do |format|
       format.js
     end
@@ -188,6 +194,9 @@ class HomeworkCommonController < ApplicationController
       @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count}
     end
     @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
     respond_to do |format|
       format.js
     end

app/controllers/student_work_controller.rb

@@ -89,7 +89,9 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
+      #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil? ||
+          (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
         @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  #学生 && 未开启匿评 只看到自己的
@@ -110,7 +112,7 @@ class StudentWorkController < ApplicationController
       end
       @student_work_count = (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).count
     else
-      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
         @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  #学生 && 未开启匿评 只看到自己的
@@ -166,6 +168,7 @@ class StudentWorkController < ApplicationController
 
   def create
     if params[:student_work]
+      @submit_result = true
       student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
       student_work ||= StudentWork.new
       student_work.name = params[:student_work][:name]
@@ -181,7 +184,6 @@ class StudentWorkController < ApplicationController
       else
         student_work.late_penalty = 0
       end
-
       if student_work.save
         course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
         if course_activity
@@ -196,21 +198,13 @@ class StudentWorkController < ApplicationController
         @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
         respond_to do |format|
           format.js
-=begin
-          format.html {
-            flash[:notice] = l(:notice_successful_create)
-            redirect_to student_work_index_url(:homework => @homework.id)
-          }
-=end
         end
         return
       end
     end
+    @submit_result = false
     respond_to do |format|
-      format.html {
+      format.js
-        flash[:notice] = l(:notice_failed_create)
-        redirect_to new_student_work_url(:homework => @homework.id)
-      }
     end
   end
 
@@ -227,24 +221,36 @@ class StudentWorkController < ApplicationController
 
   def update
     if params[:student_work]
+      @submit_result = true
       @work.name = params[:student_work][:name]
       @work.description = params[:student_work][:description]
       @work.project_id = params[:student_work][:project]
       @work.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@work)
       if @work.save
+=begin
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_edit)
             redirect_to student_work_index_url(:homework => @homework.id)
           }
+=end
+        @student_work = @work
+        respond_to do |format|
+          format.js
         end
         return
       end
     end
+=begin
     respond_to do |format|
       format.html{redirect_to edit_student_work_url(@work)}
     end
+=end
+    @submit_result = false
+    respond_to do |format|
+      format.js
+    end
   end
 
   def show

app/controllers/words_controller.rb

@@ -60,6 +60,11 @@ class WordsController < ApplicationController
         course_activity.updated_at = Time.now
         course_activity.save
       end
+      principal_activity = PrincipalActivity.where("principal_act_type='JournalsForMessage' and principal_act_id =#{parent_id}").first
+      if principal_activity
+        principal_activity.updated_at = Time.now
+        principal_activity.save
+      end
       user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first
       if user_activity
         user_activity.updated_at = Time.now
@@ -272,6 +277,7 @@ class WordsController < ApplicationController
             format.js{
               @user_activity_id = params[:user_activity_id]
               @is_in_course = params[:is_in_course]
+              @course_activity = params[:course_activity]
               @homework_common_id = params[:homework_common_id]
             }
           end

app/helpers/application_helper.rb

@@ -2307,15 +2307,15 @@ module ApplicationHelper
   end
 
   #获取匿评相关连接代码
-  def homework_anonymous_comment homework
+  def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
     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 && 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'
+        link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
       when 2
-        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
+        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
       when 3
         # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
@@ -2372,10 +2372,12 @@ module ApplicationHelper
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
             link_to "匿评结束", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
-          elsif homework.homework_type == 2 #编程作业不能修改作品
+          elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
-            link_to "修改作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+            link_to "修改作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+            link_to "修改作品(#{homework.student_works.count})", edit_student_work_path(work.id),:class => 'c_blue'
           else
-            link_to "修改作品(#{homework.student_works.count})",  edit_student_work_path(work.id),:class => 'c_blue'
+            link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
           end
         end
       end

app/helpers/homework_common_helper.rb

@@ -57,12 +57,12 @@ module HomeworkCommonHelper
   end
 
   #根据传入作业确定跳转到开启匿评还是关闭匿评功能
-  def alert_anonyoms_path homework,homework_detail_manual
+  def alert_anonyoms_path homework,homework_detail_manual,user_activity_id,is_in_course,course_activity
     link = ""
     if homework_detail_manual.comment_status == 1
-      link = start_anonymous_comment_homework_common_url homework.id
+      link = start_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
     elsif homework_detail_manual.comment_status == 2
-      link = stop_anonymous_comment_homework_common_url homework.id
+      link = stop_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
     end
     link
   end

app/models/journals_for_message.rb

@@ -136,10 +136,8 @@ class JournalsForMessage < ActiveRecord::Base
 
   #用户动态公共表记录
   def act_as_principal_activity
-    if self.jour_type == 'Principal'
+    if self.jour_type == 'Principal' && self.m_parent_id.nil?
-      unless self.user_id == self.jour.id &&  self.user_id != self.reply_id && self.reply_id != 0
+      self.principal_acts << PrincipalActivity.new(:user_id => self.user_id, :principal_id => self.jour_id)
-        self.principal_acts << PrincipalActivity.new(:user_id => self.user_id, :principal_id => self.jour_id)
-      end
     end
   end
 

app/views/courses/_join_private_course.html.erb

@@ -73,11 +73,18 @@
             </li>
             <li style="margin-top: 30px;">
               <span style="margin-right: 20px;">身&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份：</span>
-              <select name="role" class="IDType">
+              <% if User.current.logged? && User.current.extensions &&  User.current.extensions.identity == 0%>
-                <option value="9">教师</option>
+                  <select name="role" class="IDType">
-                <option value="7">教辅</option>
+                    <option value="9">教师</option>
-                <option value="10">学生</option>
+                    <option value="7">教辅</option>
-              </select>
+                    <option value="10">学生</option>
+                  </select>
+              <%else%>
+                  <select name="role" class="IDType">
+                    <option value="10">学生</option>
+                    <option value="7">教辅</option>
+                  </select>
+              <%end%>
             </li>
             <li>
               <a href="javascript:" class="btn_join" style="margin-left: 50px;" onclick="submit_form(this);">

app/views/courses/set_course_outline.js.erb

@@ -3,6 +3,6 @@ hideModal();
 <% else %>
     $("#course_outline_bar").html('<a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>')
 <%end %>
-<%if @is_in_show_outline_page && @is_in_show_outline_page == 'Y'%>
+<%#if @is_in_show_outline_page && @is_in_show_outline_page == 'Y'%>
     window.location.href='<%=syllabus_course_path(@course) %>';
-<% end %>
+<%# end %>

app/views/courses/syllabus.html.erb

@@ -58,7 +58,7 @@
                                 '取消大纲',
                                 {:controller => 'blog_comments',:action => 'destroy',:user_id=>BlogComment.find(@course.outline).author_id,:blog_id=>BlogComment.find(@course.outline).blog_id, :id => @course.outline,:course_id=>@course.id},
                                 :method => :delete,
-                                :data => {:confirm => '确定取消么'},
+                                :data => {:confirm => '您确定要取消么？'},
                                 :class => 'postOptionLink'
                         ) if User.current && User.current.id == @article.author.id %>
                   </li>

app/views/files/_upload_course_files.erb

@@ -7,7 +7,7 @@
       <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
 
       <%= form_tag(course_files_path(course), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
-          <input type="hidden" name="course_attachment_type" value="<%= course_attachment_type%>">
+          <input type="hidden" name="in_course_toolbar" value="Y">
           <!--<p class="c_grey fr mt10 mr5">-->
           <div class="c_dark">
             <input name="course_attachment_type" type="radio" value="1" checked class="c_dark" >课件</input>&nbsp;<span class="c_grey">|</span>&nbsp;

app/views/files/_upload_show_project.html.erb

@@ -8,6 +8,7 @@
 
       <%= form_tag(project_files_path(project), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
           <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
+          <input type="hidden" name="in_project_toolbar" value="Y">
           <%= render :partial => 'files/attachement_list',:locals => {:project => project} %>
           <div class="cl"></div>
           <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>

app/views/files/create.js.erb

@@ -23,26 +23,35 @@ $("#upload_file_count").text("未上传文件");
 $('#upload_file_div').slideToggle('slow');
   <% if @project %>
     hideModal();
-    $("#resource_list").html('<%= j(render partial:  "project_file_new" ,locals: {project: @project}) %>');
+    <%if @in_project_toolbar%>
-    $("#project_files_count_info").html("<%= @all_attachments.count%>");
+        window.location.href = '<%= project_files_path(@project)%>'
-    $("#project_files_count_nav").html("(<%= @all_attachments.count%>)")
+    <%else%>
-//    添加文件上传成功提示
+
-    <% unless params[:attachments].nil? %>
+        $("#resource_list").html('<%= j(render partial:  "project_file_new" ,locals: {project: @project}) %>');
-        var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+        $("#project_files_count_info").html("<%= @all_attachments.count%>");
-        $("#course_list").prepend(div);
+        $("#project_files_count_nav").html("(<%= @all_attachments.count%>)")
-        setTimeout( function(){div.remove();},3000)
+    //    添加文件上传成功提示
+        <% unless params[:attachments].nil? %>
+            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+            $("#course_list").prepend(div);
+            setTimeout( function(){div.remove();},3000)
+        <% end %>
     <% end %>
   <%elsif  @course%>
-    closeModal();
+    hideModal();
-    $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
+    <%if @in_course_toolbar %>
-    $("#courses_files_count_info").html("<%= @all_attachments.count%>");
+        window.location.href='<%= course_files_path(@course)%>'
-    $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
+    <%else%>
-    //    添加文件上传成功提示,
+        $("#resource_list").html('<%= j(render partial:  "course_file" ,locals: {course: @course}) %>');
-    <% unless params[:attachments].nil? %>
+        $("#courses_files_count_info").html("<%= @all_attachments.count%>");
-        var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+        $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
-        $("#course_list").prepend(div);
+        //    添加文件上传成功提示,
-        setTimeout( function(){div.remove();},3000)
+        <% unless params[:attachments].nil? %>
-    <% end %>
+            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+            $("#course_list").prepend(div);
+            setTimeout( function(){div.remove();},3000)
+        <% end %>
+    <%end%>
   <% end %>
 <% end %>
 $(document).ready(img_thumbnails);

app/views/homework_common/_alert_anonyoms.html.erb

@@ -34,7 +34,7 @@
         </p>
     <% end %>
     <div class="ni_btn">
-      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual%>');" style="margin-bottom: 20px;" >
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual,@user_activity_id,@is_in_course,@course_activity%>');" style="margin-bottom: 20px;" >
         确&nbsp;&nbsp;定
       </a>
       <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">

app/views/homework_common/start_anonymous_comment.js.erb

@@ -1,12 +1,19 @@
 <% if @statue == 1%>
-alert('启动成功');
+    alert('启动成功');
-$("#<%= @homework.id %>_start_anonymous_comment").replaceWith('<%= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');
+    <% if @user_activity_id == -1 %>
+        $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+        init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+    <% else %>
+        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    <% end %>
+/*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/
 <% elsif @statue == 2 %>
-alert('启动失败\n作业总数大于等于2份时才能启动匿评');
+    alert('启动失败\n作业总数大于等于2份时才能启动匿评');
 <% elsif @statue == 3%>
-alert("已开启匿评，请务重复开启");
+    alert("已开启匿评，请务重复开启");
 <% elsif @statue == 4%>
-alert("您没有权限开启匿评");
+    alert("您没有权限开启匿评");
 <% elsif @statue == 5%>
-alert("作业提交截止之后才能启动匿评");
+    alert("作业提交截止之后才能启动匿评");
 <% end %>

app/views/homework_common/stop_anonymous_comment.js.erb

@@ -1,2 +1,10 @@
-$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('');
+alert('关闭成功');
-alert('关闭成功');
+<% if @user_activity_id == -1 %>
+$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+<% else %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% end %>
+/*
+$("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/

app/views/projects/settings/_new_repositories.html.erb

@@ -72,10 +72,12 @@
               <%= repository.identifier %></span></td>
             <td class="w150"><span class="rep_history_grey"><%=h repository.scm_name %></span></td>
             <%if repository.scm_name=="Git"%>
-                <td class="w362 pl5" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis; text-align: left" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
+                <% rep_url = "http://" + repository.login.to_s + '_'+ repository.identifier.to_s + "@" + ip.to_s + h( repository.url.slice(project_path_cut, repository.url.length)) %>
-              <%=h repository.url.slice(project_path_cut, repository.url.length) %>">
+                <td class="w362 pl5" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis; text-align: left">
                 <span class="rep_history_grey">
-                  <%=truncate( 'http://' <<  repository.login.to_s << '_'<<   repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>60) %>
+                  <textarea id="copy_rep_content2_<%= repository.id %>" class="cloneUrl2 fl" type="input" ><%= rep_url %></textarea>
+                  <a href="javascript:void(0);" onclick="jsCopy2(<%= repository.id %>)"><span class="vl_copy2" title="点击复制版本库地址"></span></a>
+                  <%#= rep_url %>
                 </span>
                 </td><!--Modified by tanxianbo-->
             <%else %>

app/views/repositories/_dir_list_content.html.erb

@@ -21,7 +21,7 @@
           {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
 </td>
-<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
+<!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
   <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
 <% if @repository.report_last_commit %>
 <td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>

app/views/student_work/_add_score.html.erb

@@ -16,7 +16,7 @@
             <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
           </div>
       <%end%>
-      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();$('#about_hwork_<%= @work.id%>').html('');">提交</a>
+      <a href="javascript:void(0);" class="blue_n_btn fr evaluation_submit" onclick="$(this).parent().parent().submit();$('#about_hwork_<%= work.id%>').html('');">提交</a>
       <div class="cl"></div>
     </li>
 <% end%>

app/views/student_work/_evaluation_un_work.html.erb

@@ -28,7 +28,7 @@
   <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <% if student_work.created_at && @homework.end_time%>
         <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+        <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
             <span class="c_red">[迟交]</span>
         <% end %>
     <% end %>

app/views/student_work/_evaluation_work.html.erb

@@ -48,7 +48,7 @@
   </li>
   <li class="hworkList130 c_grey" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
+    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %>
         <span class="c_red">[迟交]</span>
     <% end %>
   </li>
@@ -58,6 +58,6 @@
   <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
   </li>
-  <li class="hworkTip"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
+  <li class="hworkTip"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
 </ul>
 

app/views/student_work/_programing_work_show.html.erb

@@ -6,7 +6,7 @@
       <%=format_time work.created_at %>
     </li>
 
-    <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
           <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>

app/views/student_work/_show.html.erb

@@ -6,7 +6,7 @@
       <%=format_time work.created_at %>
     </li>
 
-    <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
           <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>