merge

app/controllers/attachments_controller.rb

@@ -185,7 +185,6 @@ class AttachmentsController < ApplicationController
     end
     @attachment.filename = params[:filename].presence || Redmine::Utils.random_hex(16)
     saved = @attachment.save
-
     respond_to do |format|
       format.js
       format.api {
@@ -198,6 +197,33 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  def upload_attachment_version
+    @flag = false
+    Attachment.transaction do
+      @old_attachment = Attachment.find params[:old_attachment_id]
+      #取出当前上传的文件
+      @attachment = Attachment.find(params[:attachments ].first[1][:attachment_id])
+      #将需要修改的记录保存到历史记录
+      @history = AttachmentHistory.new
+      @history.attributes = @old_attachment.attributes.dup.except("id")
+      @history.attachment_id = params[:old_attachment_id]
+      #需要更新版本号，需要拿到原来该文件最大的历史版本号
+      @old_history = @old_attachment.attachment_histories.reorder('version desc').first
+      @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.save
+      #删除当前记录
+      @attachment.delete
+      @flag = true
+    end
+
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def destroy
     if @attachment.container.respond_to?(:init_journal)
       @attachment.container.init_journal(User.current)
@@ -494,6 +520,15 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  #找到文件的所有的历史版本
+  def attachment_versions
+    @attachment = Attachment.find(params[:id])
+    @attachment_histories = @attachment.attachment_histories
+    respond_to do |format|
+      format.js
+    end
+  end
+
 private
   def find_project
     @attachment = Attachment.find(params[:id])

app/controllers/exercise_controller.rb

@@ -450,7 +450,7 @@ class ExerciseController < ApplicationController
         if params[:answer_text].nil? || params[:answer_text].blank?
           #用户提交空答案，视作不作答
           @percent = get_percent(@exercise,User.current)
-          render :json => {:text => ea.answer_text,:percent => format("%.2f", @percent)}
+          render :json => {:text => "",:percent => format("%.2f", @percent)}
         else
           #添加答案
           ea = ExerciseAnswer.new
@@ -476,7 +476,7 @@ class ExerciseController < ApplicationController
           # 用户提交空答案，视为删除答案
           if ea.delete
             @percent = get_percent(@exercise,User.current)
-            render :json => {:text => ea.answer_text,:percent => format("%.2f", @percent)}
+            render :json => {:text => "",:percent => format("%.2f", @percent)}
           else
             render :json => {:text => "failure"}
           end

app/controllers/files_controller.rb

@@ -745,7 +745,16 @@ class FilesController < ApplicationController
     q = "%#{@q.strip}%"
     @result = find_course_attache q,@course,sort
     @result = visable_attachemnts @result
-    @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
+    if params[:other]
+      @result = @result.select{|attachment|
+        !attachment.tag_list.include?('课件') &&
+        !attachment.tag_list.include?('软件') &&
+            !attachment.tag_list.include?('媒体') &&
+            !attachment.tag_list.include?('代码') &&
+            !attachment.tag_list.include?('论文')  }
+    else
+      @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)} unless @tag_name.blank?
+    end
     @searched_attach = paginateHelper @result,10
     @tag_list = get_course_tag_list @course
 

app/controllers/homework_common_controller.rb

@@ -63,7 +63,7 @@ class HomeworkCommonController < ApplicationController
       end
       @homework.end_time = params[:homework_common][:end_time] || Time.now
       @homework.course_id = params[:course_id]
-      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1
+      @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0
 
       homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new
       if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0

app/controllers/issues_controller.rb

@@ -85,7 +85,7 @@ class IssuesController < ApplicationController
       params[:page] = (params[:page] || 1).to_i + 1 #页码需要加1
       @offset ||= @issue_pages.offset
       @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
-                              :order => sort_clause,
+                              :order => 'issues.updated_on desc',
                               :offset => @offset,
                               :limit => @limit)
       if params[:set_filter]

app/controllers/messages_controller.rb

@@ -75,7 +75,7 @@ class MessagesController < ApplicationController
       @replies = paginateHelper messages_replies,10
       @reply = Message.new(:subject => "RE: #{@message.subject}")
       render :action => "show", :layout => "base_courses"#by young
-    else
+    elsif @project
       @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
       @replies =  @topic.children.
           includes(:author, :attachments, {:board => :project}).
@@ -86,6 +86,18 @@ class MessagesController < ApplicationController
 
       @reply = Message.new(:subject => "RE: #{@message.subject}")
       render :action => "show", :layout => "base_projects"#by young
+    else
+      @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
+      @replies =  @topic.children.
+          includes(:author, :attachments, {:board => :project}).
+          reorder("#{Message.table_name}.created_on DESC").
+          limit(@reply_pages.per_page).
+          offset(@reply_pages.offset).
+          all
+
+      @reply = Message.new(:subject => "RE: #{@message.subject}")
+      @organization = @org_subfield.organization
+      render :action => "show", :layout => "base_org"#by young
     end
   end
 
@@ -199,6 +211,8 @@ class MessagesController < ApplicationController
     end
     if params[:user_activity_id]
       @user_activity_id = params[:user_activity_id]
+      @is_course = params[:is_course]
+      @is_board = params[:is_board]
       respond_to do |format|
         format.js
       end
@@ -219,39 +233,52 @@ class MessagesController < ApplicationController
     @isReply = false
     if @project
       (render_403; return false) unless @message.editable_by?(User.current)
-    else
+    elsif @course
       (render_403; return false) unless @message.course_editable_by?(User.current)
+    else
+      (render_403; return false) unless @message.org_subfield_editable_by?(User.current)
     end
 
     @message.safe_attributes = params[:message]
     if request.post? && @message.save
       attachments = Attachment.attach_files(@message, params[:attachments])
       render_attachment_warning_if_needed(@message)
-      flash[:notice] = l(:notice_successful_update)
+      #flash[:notice] = l(:notice_successful_update)
       @message.reload
-      if params[:is_board]
+      if params[:is_course] && params[:is_course].to_i == 0
+        redirect_to user_activities_path(User.current.id)
+      elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 0
         if @project
-          redirect_to project_boards_path(@project)
+          redirect_to project_path(@project)
         elsif @course
-          redirect_to course_boards_path(@course)
+          redirect_to course_activity_path(@course)
         end
-      else
-        redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id))
-      end
-    elsif request.get? || request.post?
-      if params[:is_board]
+      elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 1
         if @project
           redirect_to project_boards_path(@project)
         elsif @course
           redirect_to course_boards_path(@course)
         end
       else
-        respond_to do |format|
-          format.html {
-            layout_file = @project ? 'base_projects' : 'base_courses'
-            render :layout => layout_file
-          }
-        end
+        redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id))
+      end
+    elsif request.get? || request.post?
+      if params[:is_course] && params[:is_board]
+        @is_course = params[:is_course]
+        @is_board = params[:is_board]
+      end
+      respond_to do |format|
+        format.html {
+          if @project
+            layout_file = 'base_projects'
+          elsif @course
+            layout_file = 'base_courses'
+          elsif @org_subfield
+            @organization = @org_subfield.organization
+            layout_file = 'base_org'
+          end
+          render :layout => layout_file
+        }
       end
     end
   end
@@ -260,31 +287,46 @@ class MessagesController < ApplicationController
   def destroy
     if @project
       (render_403; return false) unless @message.destroyable_by?(User.current)
-    else
+    elsif @course
       (render_403; return false) unless @message.course_destroyable_by?(User.current)
+    else
+      (render_403; return false) unless @message.org_subfield_editable_by?(User.current)
     end
     r = @message.to_param
     @message.destroy
     # modify by nwb
     if @project
-      if params[:is_board]
-        redirect_to project_boards_url(@project)
+      if params[:is_course] && params[:is_course].to_i == 0
+        redirect_to user_activities_path(User.current.id)
+      elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 0
+        redirect_to project_path(@project)
+      elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 1
+        redirect_to project_boards_path(@project)
+      elsif @message.parent
+        redirect_to board_message_url(@board, @message.parent, :r => r)
       else
-        if @message.parent
-          redirect_to board_message_url(@board, @message.parent, :r => r)
-        else
-          redirect_to project_board_url(@project, @board)
-        end
-        # redirect_to board_message_url(@board, @topic, :r => @reply)
+        redirect_to project_board_url(@project, @board)
       end
     elsif @course
+      if params[:is_course] && params[:is_course].to_i == 0
+        redirect_to user_activities_path(User.current.id)
+      elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 0
+        redirect_to course_activity_path(@course)
+      elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 1
+        redirect_to course_boards_path(@course)
+      elsif @message.parent
+        redirect_to board_message_url(@board, @message.parent, :r => r)
+      else
+        redirect_to course_boards_path(@course)
+      end
+    elsif @org_subfield
       if params[:is_board]
-        redirect_to course_boards_url(@course)
+        redirect_to organization_path(:id => @org_subfield.organization_id, :org_subfield_id => @org_subfield.id)
       else
         if @message.parent
           redirect_to board_message_url(@board, @message.parent, :r => r)
         else
-          redirect_to course_board_url(@course, @board)
+          redirect_to organization_path(:id => @org_subfield.organization_id, :org_subfield_id => @org_subfield.id)
         end
       end
     end
@@ -319,15 +361,25 @@ class MessagesController < ApplicationController
     org_subfield_ids = params[:org_subfields]
     @message = Message.find(params[:id])
     # @message.update_attribute(:updated_on, Time.now)
-    type = @message.board.course_id.nil? ? "Project":"Course"
+    # type = @message.board.course_id.nil? ? "Project":"Course"
     org_subfield_ids.each do |field_id|
-      OrgSubfieldMessage.create(:org_subfield_id => field_id.to_i, :message_id => @message.id, :message_type => type)
-      org_acts = OrgActivity.where("container_type='OrgSubfield' and container_id=? and org_act_type='Message' and org_act_id=?", field_id.to_i, @message.id)
-      if org_acts.all.size() > 0
-        org_acts.first.update_attribute(:updated_at, Time.now)
-      else
-        OrgActivity.create(:container_type => 'OrgSubfield', :container_id => field_id.to_i, :org_act_type=>'Message', :org_act_id => @message.id, :user_id => User.current.id)
+      @message.quotes = @message.quotes.nil? ? 1 : (@message.quotes + 1)
+      @message.save
+      board = OrgSubfield.find(field_id).boards.first
+      mes = Message.create(:board_id => board.id, :subject => @message.subject, :content => @message.content, :author_id => User.current.id,
+                           :created_on => Time.now, :updated_on => Time.now, :locked => @message.locked, :sticky => @message.sticky)
+      @message.attachments.each do |attach|
+        mes.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
+                  :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+                  :is_public => attach.is_public,  :quotes => 0)
       end
+      # OrgSubfieldMessage.create(:org_subfield_id => field_id.to_i, :message_id => mes.id, :message_type => type)
+      # org_acts = OrgActivity.where("container_type='OrgSubfield' and container_id=? and org_act_type='Message' and org_act_id=?", field_id.to_i, @message.id)
+      # if org_acts.all.size() > 0
+      #   org_acts.first.update_attribute(:updated_at, Time.now)
+      # else
+      OrgActivity.create(:container_type => 'OrgSubfield', :container_id => field_id.to_i, :org_act_type=>'Message', :org_act_id => mes.id, :user_id => User.current.id)
+      # end
     end
   end
 
@@ -347,6 +399,9 @@ class MessagesController < ApplicationController
       @project = @board.project
     elsif  @board.course_id
       @course = @board.course
+    else
+      @org_subfield = @board.org_subfield
+      @organization = @org_subfield
     end
 
   rescue ActiveRecord::RecordNotFound

app/helpers/application_helper.rb

@@ -2588,6 +2588,12 @@ module ApplicationHelper
     end
   end
 
+  def file_preview_eye(file, html_options={})
+    if %w(pdf pptx doc docx xls xlsx).any?{|x| file.filename.downcase.end_with?(x)}
+      link_to '', download_named_attachment_path(file.id, file.filename, preview: true),html_options
+    end
+  end
+
   #将文本内的/n转换为<br>
   def text_format text
     text.gsub("&","&amp;").gsub("<","&lt;").gsub(">","&gt;").gsub("\n","<br/>").html_safe

app/helpers/org_subfields_helper.rb

@@ -1,2 +1,3 @@
 module OrgSubfieldsHelper
+  include OrganizationsHelper
 end

app/helpers/organizations_helper.rb

@@ -17,6 +17,15 @@ module OrganizationsHelper
       s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
   end
 
-
+  def get_default_name field
+    case field.name
+      when 'activity' then
+        return '动态'
+      when 'course' then
+        return '课程'
+      when 'project' then
+        return '项目'
+    end
+  end
 
 end

app/helpers/users_helper.rb

@@ -49,6 +49,8 @@ module UsersHelper
         '批改附件'
       when 'Principal'
         '用户资源'
+      when 'OrgSubfield'
+        '组织资源'
     end
   end
 

app/models/attachment.rb

@@ -32,6 +32,7 @@ class Attachment < ActiveRecord::Base
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
   include UserScoreHelper
+  has_many :attachment_histories
 
   validates :filename, presence: true, length: {maximum: 254}
   validates :author, presence: true
@@ -348,11 +349,18 @@ class Attachment < ActiveRecord::Base
 
   # Deletes the file from the file system if it's not referenced by other attachments
   def delete_from_disk
-    if Attachment.where("disk_filename = ? AND id <> ?", disk_filename, id).empty?
+    #资源存在，且历史记录为0 且 该资源没有存在任何拷贝才能删除资源
+    if Attachment.where("disk_filename = ? AND id <> ?", disk_filename, id).empty?  && self.attachment_histories.count == 0 && Attachment.where('copy_from = ?',self.id) .count == 0
       delete_from_disk!
     end
   end
 
+  #有了历史记录的数据记录是不能被删除的。
+  #true 能被删除 false 不能被删除
+  def destroyable
+    self.attachment_histories.count == 0
+  end
+
   # Returns file's location on disk
   def diskfile
     File.join(self.class.storage_path, disk_directory.to_s, disk_filename.to_s)

app/models/attachment_history.rb

@@ -0,0 +1,3 @@
+class AttachmentHistory < ActiveRecord::Base
+  belongs_to :attachment,foreign_key: 'attachment_id'
+end

app/models/board.rb

@@ -19,6 +19,7 @@ class Board < ActiveRecord::Base
   include Redmine::SafeAttributes
   belongs_to :project,:touch => true
   belongs_to :course,:touch=>true
+  belongs_to :org_subfield, :touch => true
   has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
   has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC"
   belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id

app/models/journal.rb

@@ -17,10 +17,10 @@
 
 class Journal < ActiveRecord::Base
   include UserScoreHelper
-  belongs_to :journalized, :polymorphic => true
+  belongs_to :journalized, :polymorphic => true,:touch => true
   # added as a quick fix to allow eager loading of the polymorphic association
   # since always associated to an issue, for now
-  belongs_to :issue, :foreign_key => :journalized_id
+  belongs_to :issue, :foreign_key => :journalized_id,:touch => true
 
   belongs_to :user
   has_many :details, :class_name => "JournalDetail", :dependent => :delete_all

app/models/mailer.rb

@@ -155,7 +155,6 @@ class Mailer < ActionMailer::Base
   # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
   def send_for_user_activities(user, date_to, days)
     date_from = date_to - days.days
-    subject = "[ #{user.show_name}#{l(:label_day_mail)}]"
     date_from = "#{date_from} 17:59:59"
     date_to = "#{date_to} 17:59:59"
     # 生成token用于直接点击登录
@@ -270,10 +269,11 @@ class Mailer < ActionMailer::Base
     total_count = @issues.count + @issues_journals.count + @course_messages.count + @project_messages.count + @course_news.count + @course_news_comments.count + @project_news.count + @project_news_comments.count +
                   @project_attachments.count + @course_journal_messages.count + @user_journal_messages.count + @project_journal_messages.count + @forums.count + @memos.count + @attachments.count +
                   @bids.count + @wiki_contents.count
+    subject = "[ #{user.show_name}#{l(:label_day_mail_first)}#{total_count}#{l(:label_day_mail_last)}]"
     @subject = " #{user.show_name}#{l(:label_day_mail_first)}#{total_count}#{l(:label_day_mail_last)}"
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发
-    mail :to => user.mail,:subject => subject if has_content
+    mail :to => user.mail,:subject => @subject if has_content
   end
 
   # 作业截止时间邮件提醒

app/models/message.rb

@@ -23,8 +23,8 @@ class Message < ActiveRecord::Base
   belongs_to :board,:touch => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
-  has_many :org_subfield_messages, :dependent => :destroy
-  has_many :org_subfields, :through => :org_subfield_messages
+  # has_many :org_subfield_messages, :dependent => :destroy
+  # has_many :org_subfields, :through => :org_subfield_messages
 
   acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
   acts_as_attachable
@@ -44,6 +44,8 @@ class Message < ActiveRecord::Base
 
   has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
 
+  after_destroy :delete_org_activities
+
   acts_as_searchable :columns => ['subject', 'content'],
                      :include => {:board => :project},
                      :project_key => "#{Board.table_name}.project_id",
@@ -150,6 +152,10 @@ class Message < ActiveRecord::Base
     usr && usr.logged? && (usr.allowed_to?(:edit_messages, course) || (self.author == usr && usr.allowed_to?(:edit_own_messages, course)))
   end
 
+  def org_subfield_editable_by?(usr)
+    usr && usr.logged? && (usr.admin?  || self.author == usr ||usr.admin_of_org?(self.board.org_subfield.organization))
+  end
+
   def course_destroyable_by?(usr)
     usr && usr.logged? && (usr.allowed_to?(:delete_messages, course) || (self.author == usr && usr.allowed_to?(:delete_own_messages, course)))
   end
@@ -192,7 +198,7 @@ class Message < ActiveRecord::Base
   # Description 
   def act_as_forge_activity
     # 如果project为空，那么就是课程相关的消息
-    if !self.board.project.nil? && self.parent_id.nil?
+    if self.board.project_id != -1 && self.parent_id.nil?
       self.forge_acts << ForgeActivity.new(:user_id => self.author_id,
                                              :project_id => self.board.project.id)
     end
@@ -227,7 +233,7 @@ class Message < ActiveRecord::Base
           end
         end
       end
-    else  # 项目相关
+    elsif self.project  # 项目相关
       if self.parent_id.nil?   # 主贴
         self.project.members.each do |m|
           if  m.user_id != self.author_id
@@ -312,4 +318,8 @@ class Message < ActiveRecord::Base
       end
     end
   end
+
+  def delete_org_activities
+    OrgActivity.where("org_act_type='Message' and org_act_id =#{self.id} and container_type='OrgSubfield'").destroy_all
+  end
 end

app/models/org_subfield.rb

@@ -4,7 +4,22 @@ class OrgSubfield < ActiveRecord::Base
   has_many :files
   has_many :org_subfield_messages, :dependent => :destroy
   has_many :messages, :through => :org_subfield_messages
+  has_many :boards, :dependent => :destroy
   acts_as_attachable
+  after_create :create_board_sync
+  # 创建资源栏目讨论区
+  def create_board_sync
+    @board = self.boards.build
+    #self.name=" #{l(:label_borad_course) }"
+    @board.name = " #{l(:label_borad_org_subfield) }"#self.name
+    @board.description = self.name.to_s
+    @board.project_id = -1
+    if @board.save
+      logger.debug "[OrgSubfield Model] ===> #{@board.to_json}"
+    else
+      logger.error "[OrgSubfield Model] ===> Auto create board when org_subfield saved, because #{@board.full_messages}"
+    end
+  end
 
   def project
   end

app/models/organization.rb

@@ -9,9 +9,15 @@ class Organization < ActiveRecord::Base
   has_many :org_subfields, :dependent => :destroy
   has_many :users, :through => :org_members
   validates_uniqueness_of :name
-  after_create :save_as_org_activity
+  after_create :save_as_org_activity, :add_default_subfields
 
   def save_as_org_activity
     OrgActivity.create(:user_id => User.current.id, :org_act_id => self.id, :org_act_type => 'CreateOrganization', :container_id => self.id, :container_type => 'Organization')
   end
+
+  def add_default_subfields
+    OrgSubfield.create(:organization_id => self.id, :name => 'activity', :field_type => 'default')
+    OrgSubfield.create(:organization_id => self.id, :name => 'course', :field_type => 'default')
+    OrgSubfield.create(:organization_id => self.id, :name => 'project', :field_type => 'default')
+  end
 end

app/services/courses_service.rb

@@ -196,6 +196,8 @@ class CoursesService
       @course.tea_id = current_user.id
       @course.term = params[:term]
       @course.time = params[:time]
+      @course.end_term = params[:end_term]
+      @course.end_time = params[:end_time]
       #@course.school_id = params[:occupation]
       @course.school_id = current_user.user_extensions.school_id
       @course.setup_time = params[:setup_time]

app/views/attachments/_form_course.html.erb

@@ -4,10 +4,10 @@
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="sub_btn">
 
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
-      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
+      <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+      <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
+      <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
@@ -17,10 +17,10 @@
   <% container.attachments.each_with_index do |attachment, i| %>
      <span id="attachments_p<%= i %>" class="attachment">
 
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-       <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
-       <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-       <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
+       <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+       <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
+       <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
        <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
        <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>

app/views/attachments/_show_attachment_history.html.erb

@@ -0,0 +1,54 @@
+<!--<div class="resourceUploadPopup">-->
+<span class="uploadDialogText">更新资源版本</span>
+<!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
+<div class="uploadBoxContainer mt0">
+  <div>
+    <div>当前版本
+            <span class="attachment" >
+              <input readonly="readonly" name="attachments[1][filename]" value="<%=@attachment.filename%>" class="upload_filename readonly" type="text">
+            </span>
+    </div>
+    <% unless @attachment_histories.empty? %>
+
+    <div >历史版本</div>
+    <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">
+          <span>版本号：<%= history.version %></span>
+        </span>
+
+    <% end %>
+    </div>
+    <% end %>
+
+  </div>
+  <%= form_tag(upload_attachment_version_path, :multipart => true,:remote => !ie8?,:name=>"upload_form",:id=>'upload_form') do %>
+      <%= hidden_field_tag :old_attachment_id,@attachment.id %>
+      <div>
+        <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+        </span>
+      </div>
+      <div class="uploadBox">
+        <input type="hidden" name="attachment_type" value="1">
+        <%= render :partial => 'attachments/upload_attachment_new_version' %>
+        <div class="cl"></div>
+        <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
+        <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
+      </div>
+      <div class="uploadResourceIntr">
+        <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
+        <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>
+      </div>
+      </div>
+      <div class="cl"></div>
+      <div style="margin-top: 10px" >
+        <div class="courseSendSubmit">
+          <!--<a href="javascript:void(0);" class="sendSourceText" onclick="">确定</a>-->
+          <%= submit_tag '确定',:onclick=>'upload_attachment_version(event);',:onfocus=>'this.blur()',:id=>'upload_files_submit_btn',:class=>'sendSourceText' %>
+        </div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" id="upload_files_cancle_btn" class="sendSourceText" onclick="hideModal();">取消</a></div>
+      </div>
+  <% end %>
+  <div class="cl"></div>
+  <!--</div>-->

app/views/attachments/_upload_attachment_new_version.html.erb

@@ -0,0 +1,23 @@
+
+
+<!--<button name="button" class="sub_btn" onclick="_file.click()" onmouseover="this.focus()" style="<%#= ie8? ? 'display:none' : ''%>" type="button" ><%#= l(:label_browse) %></button>-->
+<a href="javascript:void(0);" class="uploadIcon f14" name="button"   onclick="_file.click()" onmouseover="" style="<%= ie8? ? 'display:none' : ''%>">
+  <span class="chooseFile">选择文件</span></a>
+<%= file_field_tag 'attachments[dummy][file]',
+                   :id => '_file',
+                   :class => ie8? ? '':'file_selector',
+                   :multiple => true,
+                   :onchange => 'addInputFiles(this,"'+'upload_files_submit_btn'+'");',
+                   :style => ie8? ? '': 'display:none',
+                   :data => {
+                           :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                           :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                           :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                           :upload_path => uploads_path(:format => 'js',:old_attachment_id=>@attachment.id),
+                           :description_placeholder => l(:label_optional_description),
+                           :field_is_public => l(:field_is_public),
+                           :are_you_sure => l(:text_are_you_sure),
+                           :file_count => l(:label_file_count),
+                           :lebel_file_uploding => l(:lebel_file_uploding),
+                           :delete_all_files => l(:text_are_you_sure_all)
+                   } %>

app/views/attachments/attachment_versions.js.erb

@@ -0,0 +1,7 @@
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'attachments/show_attachment_history' )%>');
+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().addClass("resourceUploadPopup");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");