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

app/controllers/bids_controller.rb

@@ -488,6 +488,11 @@ class BidsController < ApplicationController
 
       if @bid.homework_type
         @homework = HomeworkAttach.new
+        if @bid.proportion
+          teacher_proportion = @bid.proportion * 1.0 / 100
+        else
+          teacher_proportion = 1.0
+        end
         #@homework_list = @bid.homeworks
         #增加作业按评分排序，
         #@homework_list = @bid.homeworks.eager_load(:rate_averages, :user, :attachments).order('seems_rateable_cached_ratings.avg DESC').order("#{HomeworkAttach.table_name}.created_at ASC")
@@ -495,7 +500,7 @@ class BidsController < ApplicationController
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{@bid.author_id}) AS t_score,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id <> #{@bid.author_id}) AS s_score
             FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY
-            (CASE WHEN t_score IS NULL THEN 0 ELSE t_score * #{@bid.proportion * 1.0 / 100} END + CASE WHEN s_score IS NULL THEN 0 ELSE s_score * #{1 - @bid.proportion * 1.0 / 100} END) DESC,created_at ASC")
+            (CASE WHEN t_score IS NULL THEN 0 ELSE t_score * #{teacher_proportion} END + CASE WHEN s_score IS NULL THEN 0 ELSE s_score * #{1 - teacher_proportion} END) DESC,created_at ASC")
         if params[:student_id].present?
           @temp = []
           @homework_list.each do |pro|

app/controllers/files_controller.rb

@@ -38,6 +38,17 @@ class FilesController < ApplicationController
       @isproject = true
       @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]
       @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+
+      all_attachments = []
+      @containers.each do |container|
+        all_attachments += container.attachments
+      end
+      @limit = 10
+      @feedback_count = all_attachments.count
+      @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+      @offset ||= @feedback_pages.offset
+      @curse_attachments = all_attachments[@offset, @limit]
+
       render :layout => !request.xhr?
     elsif params[:course_id]
       @isproject = false
@@ -67,6 +78,18 @@ class FilesController < ApplicationController
       else
         @containers = [ Course.includes(:attachments).reorder("#{Attachment.table_name}.created_on desc").find(@course.id)]
       end
+
+      all_attachments = []
+      @containers.each do |container|
+        all_attachments += container.attachments
+      end
+
+      @limit = 10
+      @feedback_count = all_attachments.count
+      @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+      @offset ||= @feedback_pages.offset
+      @curse_attachments = all_attachments[@offset, @limit]
+
       render :layout => 'base_courses'
     end
   end

app/models/attachment.rb

@@ -29,9 +29,9 @@ class Attachment < ActiveRecord::Base
   include UserScoreHelper
 
   validates_presence_of :filename, :author
-  validates_length_of :filename, :maximum => 255
-  validates_length_of :disk_filename, :maximum => 255
-  validates_length_of :description, :maximum => 255
+  validates_length_of :filename, :maximum => 254
+  validates_length_of :disk_filename, :maximum => 254
+  validates_length_of :description, :maximum => 254
   validate :validate_max_file_size
 
 

app/views/courses/show.html.erb

@@ -1,6 +1,6 @@
 <% if @events_by_day != nil && @events_by_day.size >0 %>
     <div class="content-title-top-avtive">
-      <!-- <h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3> -->
+      <!-- <h3><%#= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3> -->
       <p class="subtitle">
         <%#= l(:label_date_from_to, :start => format_date(@date_from), :end => format_date(@date_to - 1)) %>
       </p>
@@ -29,7 +29,7 @@
                                           <%= l(:label_new_activity) %> </span>
 
 
-                              <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url %>
+                              <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:style => "word-break:break-all;" %>
                             </td>
                           </tr>
                           <tr>

app/views/files/_course_show_all_attachment.html.erb

@@ -25,60 +25,70 @@
   </tr>
   </thead>
   <tbody>
-  <% @containers.each do |container| %>
-      <% next if container.attachments.empty? -%>
-      <% if container.is_a?(Version) -%>
-          <tr>
+  <%# @containers.each do |container| %>
+      <%# next if container.attachments.empty? -%>
+      <%# if container.is_a?(Version) -%>
+          <!--<tr>
             <th colspan="5" align="left" style="line-height: 30px; font-size: 14px; ">
-              <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package", :style => "color: #666666;") %>
+              <%#= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package", :style => "color: #666666;") %>
             </th>
-          </tr>
-      <% end -%>
-      <% container.attachments.each do |file| %>
-          <%if file.is_public == 0 && !User.current.member_of_course?(@course)%>
-              <%next%>
-          <%end%>
-          <tr class="file <%= cycle("odd", "odd") %>">
-            <td class="filename" style="font-size: 13px;  "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
-            <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
-            <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-            <td class="attach_type">
-              <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName unless file.attachmentstype.nil? %></span>
+          </tr>-->
+      <%# end -%>
+  <% if @curse_attachments != nil %>
+    <% @curse_attachments.each do |file| %>
+      <%if file.is_public == 0 && !User.current.member_of_course?(@course)%>
+          <%next%>
+      <%end%>
+      <tr class="file <%= cycle("odd", "odd") %>">
+        <td class="filename" style="font-size: 13px;  "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
+        <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
+        <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
+        <td class="attach_type">
+          <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.typeName unless file.attachmentstype.nil? %></span>
               <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
                 <%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes, :attachment => file, :contentype => selContentType} %>
               </span>
-            </td>
-            <td class="content_type"><%= file.show_suffix_type %></td>
-            <td class="field_file_dense">
-              <span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
-              &nbsp;
+        </td>
+        <td class="content_type"><%= file.show_suffix_type %></td>
+        <td class="field_file_dense">
+          <span id="field_file_dense_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.file_dense_str %></span>
+          &nbsp;
       <span id="field_file_dense_id_edit<%= file.id %>" style="white-space:nowrap;">
         <%= render :partial => 'course_file_dense_edit', :locals => {:file_dense_list => file.file_dense_list,
                                                                      :attachment => file} %>
         </span>
-            </td>
-            <td class="downloads"><%= file.downloads %></td>
-            <!-- <td class="digest" width="300px"><%= file.description %></td> -->
-            <td align="center">
-              <%= link_to(image_tag('delete.png'), attachment_path(file),
-                          :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
-            </td>
-          </tr>
-          <tr>
-            <td class='description' colspan="6">
-              <div class="tags_area">
-                <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-                <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
-                <div class="tags_gradint"></div>
-              </div>
-              <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a></div>
-            </td>
-          </tr>
-      <% end -%>
-      <% reset_cycle %>
+        </td>
+        <td class="downloads"><%= file.downloads %></td>
+        <!-- <td class="digest" width="300px"><%= file.description %></td> -->
+        <td align="center">
+          <%= link_to(image_tag('delete.png'), attachment_path(file),
+                      :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
+        </td>
+      </tr>
+      <tr>
+        <td class='description' colspan="6">
+          <div class="tags_area">
+            <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
+            <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
+            <div class="tags_gradint"></div>
+          </div>
+          <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a></div>
+        </td>
+      </tr>
   <% end -%>
+  <% end %>
+      <%# reset_cycle %>
+  <%# end -%>
   <!-- %= h downloadAll(@containers) % -->
   <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
 
+
+
   </tbody>
 </table>
+<!--分页-->
+<div class="pagination" style="float:left;">
+  <ul>
+    <%= pagination_links_full @feedback_pages %>
+  </ul>
+</div>

app/views/files/_show_all_attachment.html.erb

@@ -25,16 +25,17 @@
   </tr>
   </thead>
   <tbody>
-  <% @containers.each do |container| %>
-      <% next if container.attachments.empty? -%>
-      <% if container.is_a?(Version) -%>
-          <tr>
+  <%# @containers.each do |container| %>
+      <%# next if container.attachments.empty? -%>
+      <%# if container.is_a?(Version) -%>
+          <!--tr>
             <th colspan="5" align="left" style="line-height: 30px; font-size: 14px; ">
-              <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package", :style => "color: #666666;") %>
+              <%#= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package", :style => "color: #666666;") %>
             </th>
-          </tr>
-      <% end -%>
-      <% container.attachments.each do |file| %>
+          </tr-->
+      <%# end -%>
+  <% if @curse_attachments != nil %>
+      <% @curse_attachments.each do |file| %>
           <%if file.is_public == 0 && !User.current.member_of?(@project)%>
           <%next%>
           <%end%>
@@ -75,10 +76,17 @@
             </td>
           </tr>
       <% end -%>
-      <% reset_cycle %>
+      <%# reset_cycle %>
   <% end -%>
   <!-- %= h downloadAll(@containers) % -->
   <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
 
   </tbody>
 </table>
+
+<!--分页-->
+<div class="pagination" style="float:left;">
+  <ul>
+    <%= pagination_links_full @feedback_pages %>
+  </ul>
+</div>

app/views/news/_course_form.html.erb

@@ -5,7 +5,7 @@
 </div>
 <div class="box tabular">
   <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
-  <!-- <p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
+  <!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
   <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
   <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
 </div>

app/views/news/_form.html.erb

@@ -1,11 +1,10 @@
 <%= error_messages_for @news %>
 <div class="add_frame_header" >
-	<% str = @project ? l(:bale_news_notice) : l(:label_news_new) %>
-	<%= str %>
+	<%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
 </div>
 <div class="box tabular">
 <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
-<!-- <p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
+<!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
 <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
 </div>

app/views/news/_news.html.erb

@@ -1,9 +1,9 @@
-<!--<p><%= link_to_project(news.project) + ': ' unless @project %>
-<table><tr><td><img src="/images/new/news.png" width="40" height="40"/></td><td><%= link_to h(news.title), news_path(news) %>
-<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
+<!--<p><%#= link_to_project(news.project) + ': ' unless @project %>
+<table><tr><td><img src="/images/new/news.png" width="40" height="40"/></td><td><%#= link_to h(news.title), news_path(news) %>
+<%#= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
 
- <% unless news.summary.blank? %></td><td><span class="fontligher"><%=h news.summary %></span><% end %></td>
-<td><span class="author"><%= authoring news.created_on, news.author %></span></td></tr></table></p>-->
+ <%# unless news.summary.blank? %></td><td><span class="fontligher"><%#=h news.summary %></span><%# end %></td>
+<td><span class="author"><%#= authoring news.created_on, news.author %></span></td></tr></table></p>-->
 
 <table width="660px" border="0" align="center">
   <tr>

app/views/news/new.html.erb

@@ -1,4 +1,4 @@
-<!-- <h3><%=l(:label_news_new)%></h3> -->
+<!-- <h3><%#=l(:label_news_new)%></h3> -->
 <% if @project %>
     <%= labelled_form_for @news, :url => project_news_index_path(@project),
                           :html => {:id => 'news-form', :multipart => true} do |f| %>

plugins/redmine_code_review/app/views/code_review/_issues_show_details_bottom.html.erb

@@ -46,8 +46,8 @@ review = issue.code_review
       %>
         <%= l(:label_revision) + " "%>
       <%=  link_to_revision(assignment.revision, repo) %>
-      <% elsif assignment.attachment %>
-        <%= link_to(assignment.attachment.filename, :controller => 'attachments', :action => 'show', :id => attachment.id) %>
+      <% elsif assignment.respond_to?("attachment") && assignment.attachment %>
+        <%= link_to(assignment.attachment.filename.to_s, :controller => 'attachments', :action => 'show', :id => assignment.attachment.id) %>
       <% end %>
     </td>
   </tr>