Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh

Conflicts:
	app/views/org_document_comments/edit.html.erb

app/controllers/attachments_controller.rb

@@ -74,6 +74,45 @@ class AttachmentsController < ApplicationController
       :disposition => 'attachment'    #inline can open in browser
   end
 
+  def direct_download_history
+    @attachment_history = AttachmentHistory.find(params[:id])
+    @attachment_history.increment_download
+    send_file @attachment_history.diskfile_history, :filename => filename_for_content_disposition(@attachment_history.filename),
+              :type => detect_content_type(@attachment_history),
+              :disposition => 'attachment'    #inline can open in browser
+  end
+
+  def download_history
+    @attachment_history = AttachmentHistory.find(params[:id])
+    candown = attachment_history_candown @attachment_history
+    if candown || User.current.admin? || User.current.id == @attachment_history.author_id
+      if stale?(:etag => @attachment_history.digest)
+        if params[:preview] == 'true'
+          convered_file = @attachment_history.diskfile_history
+          #如果本身不是pdf文件，则先寻找是不是已转换化，如果没有则转化
+          unless pdf?(convered_file)
+            convered_file = File.join(Rails.root, "files", "convered_office", @attachment.disk_filename + ".pdf")
+            unless File.exist?(convered_file)
+              office = Trustie::Utils::Office.new(@attachment_history.diskfile)
+              office.conver(convered_file)
+            end
+          end
+          if File.exist?(convered_file) && pdf?(convered_file)
+            send_file convered_file,  :type => 'application/pdf; charset=utf-8', :disposition => 'inline'
+          else
+            direct_download_history
+          end
+        else
+          direct_download_history
+        end
+      end
+    else
+      render_403 :message => :notice_not_authorized
+    end
+  rescue => e
+    redirect_to "http://" + (Setting.host_name.to_s) +"/file_not_found.html"
+  end
+
   def download
     # modify by nwb
     # 下载添加权限设置
@@ -212,7 +251,7 @@ class AttachmentsController < ApplicationController
       @history.version =  @old_history.nil? ? 1 :  @old_history.version + 1
       @history.save  #历史记录保存完毕
       #将最新保存的记录 数据替换到 需要修改的文件记录
-      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public")
+      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads")
       @old_attachment.save
       #删除当前记录
       @attachment.delete

app/controllers/poll_controller.rb

@@ -214,6 +214,7 @@ class PollController < ApplicationController
   def publish_poll
     @poll.polls_status = 2
     @poll.published_at = Time.now
+    @poll.show_result = params[:show_result]
     if @poll.save
       if params[:is_remote]
         redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)

app/helpers/application_helper.rb

@@ -1997,6 +1997,18 @@ module ApplicationHelper
     courses_doing
   end
 
+  def attachment_history_candown attachment_history
+    if attachment_history.container_type == "Course"
+      course = Course.find(attachment_history.container_id)
+      candown = User.current.member_of?(course) || (course.is_public && attachment_history.is_public == 1)
+    elsif attachment_history.container_type == "Project"
+      project = Project.find(attachment_history.container_id)
+      candown = User.current.member_of?(project) || (project.is_public && attachment_history.is_public == 1)
+    elsif attachment_history.container_type == "OrgSubfield"
+      org = OrgSubfield.find(attachment_history.container_id)
+      candown = User.current.member_of_org?(org) || (org.organization.is_public && attachment_history.is_public == 1)
+    end
+  end
 
   def attachment_candown attachment
     candown = false

app/helpers/courses_helper.rb

@@ -116,6 +116,34 @@ module CoursesHelper
     @course.journals_for_messages.where('m_parent_id IS NULL').count
   end
 
+  #当前学期
+  def current_time_and_term course
+    str = ""
+    term = cur_course_term
+    if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
+      str = course.time.to_s + course.term.to_s
+    elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
+      str = course.time.to_s + course.term.to_s
+    elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
+      str = course.end_time.to_s + course.end_term.to_s
+    else
+      str = Time.now.year.to_s + cur_course_term.to_s
+    end
+    str
+  end
+
+  def set_term_value term
+    val = 0
+    if term == "春季学期"
+      val = 1
+    elsif term == "夏季学期"
+      val = 2
+    elsif term == "秋季学期"
+      val = 3
+    end
+    val
+  end
+
   # 返回学生数量，即roles表中定义的Reporter
   #def studentCount project
    # searchStudent(project).count
@@ -562,7 +590,7 @@ module CoursesHelper
     type = []
     month = Time.now.month
     now_year = year.nil? ? Time.now.year : (Time.now.year <= year ? Time.now.year : year)
-    year = month < 3 && now_year >=Time.now.year ? now_year - 1 : now_year
+    year = month < 2 && now_year >=Time.now.year ? now_year - 1 : now_year
     for i in (year..year + 10)
       option = []
       option << i
@@ -592,8 +620,10 @@ module CoursesHelper
 
   def cur_course_term
     month = Time.now.month
-    if month >= 9 || month < 3
+    if month >= 9 || month < 2
       term = "秋季学期"
+    elsif (month >= 7 && Time.now.day >= 15) || month == 8
+      term = "夏季学期"
     else
       term = "春季学期"
     end
@@ -603,7 +633,7 @@ module CoursesHelper
   def course_in_current_or_next_term course
     is_current_term = false
     is_next_term = false
-    year_now = Time.now.month < 3 ? Time.now.year - 1:Time.now.year
+    year_now = Time.now.month < 2 ? Time.now.year - 1:Time.now.year
     if course.time == year_now && course.term == cur_course_term
       is_current_term = true
     end
@@ -612,6 +642,7 @@ module CoursesHelper
     elsif cur_course_term == "春季学期" && course.time == year_now && course.term == "夏季学期"
       is_next_term = true
     elsif cur_course_term == "夏季学期" && course.time == year_now && course.term == "秋季学期"
+      is_next_term = true
     end
     is_current_term || is_next_term
   end

app/models/attachment_history.rb

@@ -1,3 +1,14 @@
 class AttachmentHistory < ActiveRecord::Base
   belongs_to :attachment,foreign_key: 'attachment_id'
+  cattr_accessor :storage_history_path
+  @@storage_history_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
+
+  # Returns file's location on disk
+  def diskfile_history
+    File.join(self.class.storage_history_path, disk_directory.to_s, disk_filename.to_s)
+  end
+
+  def increment_download
+    increment!(:downloads)
+  end
 end

app/views/attachments/_show_attachment_history.html.erb

@@ -14,7 +14,9 @@
     <div style="max-height: 95px;overflow-y:auto; background-color: #e3e3e3;" class="mb10 p10">
     <% @attachment_histories.each do |history| %>
         <span class="attachment">
-          <input readonly="readonly" name="attachments_versions_<%= history.id%>" value="<%=history.filename%>" class="upload_filename readonly" type="text">
+          <%= link_to truncate(history.filename,length: 35, omission: '...'),
+                      download_history_attachment_path(history.id, history.filename),
+                      :title => history.filename+"\n"+history.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkBlue f_14 f_b"  %>
           <span>版本号：<%= history.version %></span>
         </span>
 

app/views/attachments/attachment_versions.js.erb

@@ -2,6 +2,6 @@ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'attachments/sh
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","40%").css("left","46%");
+$('#ajax-modal').parent().css("top","40%").css("left","50%");
 $('#ajax-modal').parent().addClass("resourceUploadPopup");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");

app/views/layouts/_user_courses.html.erb

@@ -2,7 +2,7 @@
     <li class="homepageLeftMenuCoursesLine pr">
       <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
       <%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :class => "coursesLineGrey hidden #{course_endTime_timeout?(course) ? 'c_dark_grey' : ''}",
-                  :id => "show_course_#{course.id}",:title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+course.time.to_s+course.term+"）"%>
+                  :id => "show_course_#{course.id}",:title => (course.is_public? ? "公开课程：":"私有课程：")+course.name+"（"+current_time_and_term(course)+"）"%>
         <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
         <ul class="<%= count > 0 ? 'shild shildP':'subNavArrow'%>">
           <li>

app/views/layouts/base_courses.html.erb

@@ -56,7 +56,7 @@
         <ul>
           <li><%= l(:label_main_teacher)%> :&nbsp;&nbsp;<%= link_to(@course.teacher.lastname+@course.teacher.firstname, user_path(@course.teacher), :class => 'c_dblue') %></li>
           <li><%= l(:label_class_period)%> :&nbsp;&nbsp;<span ><%= @course.class_period %> <%= l(:label_class_hour) %></span></li>
-          <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= @course.time %> <%= @course.term %></span></li>
+          <li><%= l(:label_main_term)%> :&nbsp;&nbsp;<span><%= current_time_and_term @course %></span></li>
           <% if @course.school%>
             <li><%= l(:label_course_organizers)%> :&nbsp;&nbsp;<%= @course.school%></li>
           <% end%>

app/views/messages/_course_show.html.erb

@@ -34,7 +34,11 @@
 <div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @topic.id%>').show();" onmouseout="$('#message_setting_<%= @topic.id%>').hide();">
   <div class="postThemeContainer">
     <div class="postDetailPortrait">
-      <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
+      <% if @topic.status == 1 %>
+          <%= image_tag("/images/trustie_logo1.png", width: "50px", height: "50px") %>
+      <% else %>
+          <%= link_to image_tag(url_to_avatar(@topic.author), :width => 50, :height => 50,:alt=>'图像' ), user_path(@topic.author) %>
+      <% end %>
     </div>
     <div class="postThemeWrap">
       <% if User.current.logged? %>
@@ -72,10 +76,14 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <% if @topic.try(:author).try(:realname) == ' ' %>
-            <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% if @topic.status == 1 %>
+            <span class="fontBlue2">确实团队</span>
         <% else %>
-            <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+            <% if @topic.try(:author).try(:realname) == ' ' %>
+                <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+            <% else %>
+                <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+            <% end %>
         <% end %>
       </div>
       <div class="postDetailDate mb5"><%= format_time( @topic.created_on)%></div>

app/views/org_document_comments/edit.html.erb

@@ -1,6 +1,6 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-    <%= javascript_include_tag "des_kindEditor"  %>
+    <%= javascript_include_tag "des_kindEditor" %>
 <% end %>
 
 <script>

app/views/poll/_poll.html.erb

@@ -58,4 +58,11 @@
         <%end%>
     <% end%>
     <li class="polls_date fr mr10"><%= format_date poll.created_at.to_date%></li>
+    <% if poll.show_result == 1 %>
+        <% if has_commit%>
+            <li><%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fr mr10"%></li>
+        <%else%>
+            <li class="pollsbtn fr mr10 pollsbtn_grey">统计结果</li>
+        <%end%>
+    <% end %>
 <% end%>

app/views/poll/_poll_form.html.erb

@@ -315,7 +315,11 @@ function insert_MCQ(quest_type,quest_num,quest_id){
           alert("问卷标题不能为空");
       }
       else{
-          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
+          if($("#show_result").is(":checked")) {
+              $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false,:show_result=> 1}) %>');
+          } else{
+              $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false,:show_result=> 0}) %>');
+          }
           showModal('ajax-modal', '310px');
           $('#ajax-modal').css('height','120px');
           $('#ajax-modal').siblings().remove();
@@ -377,7 +381,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
       <%= l(:label_memo_create)%>
     </a>
     <div class="polls_cha">
-      <input type="checkbox" name="" value="" >
+      <input id="show_result" type="checkbox" checked name="show_result" value="1" >
       <label for="">允许学生查看调查结果</label>
     </div>
   </div>

app/views/poll/_poll_submit.html.erb

@@ -15,7 +15,7 @@
         是否确定发布该问卷？
       </p>
       <div class="polls_btn_box">
-        <%= link_to "确    定",publish_poll_poll_path(poll.id,:is_remote => is_remote), :class => "upload_btn", :onclick => "clickCanel();" %>
+        <%= link_to "确    定",publish_poll_poll_path(poll.id,:is_remote => is_remote,:show_result => show_result), :class => "upload_btn", :onclick => "clickCanel();" %>
         <a class="upload_btn upload_btn_grey" onclick="clickCanel();">
           取&nbsp;&nbsp;消
         </a>

app/views/users/_course_message.html.erb

@@ -1,15 +1,23 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>" onmouseover="$('#message_setting_<%= user_activity_id%>').show();" onmouseout="$('#message_setting_<%= user_activity_id%>').hide();">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
-      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+      <% if activity.status == 1 %>
+          <%= image_tag("/images/trustie_logo1.png", width: "50px", height: "50px") %>
+      <% else %>
+          <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
+          <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
+      <% end %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
-        <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+        <% if activity.status == 1 %>
+            <span class="fontBlue2">确实团队</span>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <% if activity.try(:author).try(:realname) == ' ' %>
+                <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <% else %>
+                <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <% end %>
         <% end %>
         TO
         <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>

app/views/users/search_user_course.js.erb

@@ -12,11 +12,11 @@ var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
 //$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 //$("#upload_box").css('display','block');
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% elsif params[:send_type] == 'file' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% elsif params[:send_type] == 'message' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% end %>
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();

app/views/users/user_resource.html.erb

@@ -21,7 +21,7 @@
         showModal('ajax-modal', '452px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","40%").css("left","46%");
+        $('#ajax-modal').parent().css("top","50%").css("left","50%");
         $('#ajax-modal').parent().addClass("resourceUploadPopup");
         $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
     }

config/routes.rb

@@ -869,6 +869,7 @@ RedmineApp::Application.routes.draw do
   get 'attachments/attachment_versions/:id',:to=>'attachments#attachment_versions',:as=>'attachments_versions'
   post 'attachments/upload_attachment_version',:to=>'attachments#upload_attachment_version',:as=>'upload_attachment_version'
   get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
+  get 'attachments/download_history/:id/:filename', :to => 'attachments#download_history', :id => /\d+/, :filename => /.*/, :as => 'download_history_attachment'
   get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/
   get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/, :as => 'thumbnail'
   get 'attachments/autocomplete'

db/schema.rb

@@ -1373,6 +1373,7 @@ ActiveRecord::Schema.define(:version => 20160202034530) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
+    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end