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

app/controllers/attachment_type_edit_controller.rb

@@ -0,0 +1,6 @@
+  #资源类型编辑control
+class AttachmentTypeEditController < ApplicationController
+  def index
+
+  end
+end

app/controllers/files_controller.rb

@@ -19,8 +19,8 @@ class FilesController < ApplicationController
   layout 'base_projects'#by young
   menu_item :files
 
-  before_filter :find_project_by_project_id
-  before_filter :authorize
+  before_filter :find_project_by_project_id#, :except => [:getattachtype]
+  before_filter :authorize, :except => [:getattachtype]
 
   helper :sort
   include SortHelper
@@ -62,20 +62,22 @@ class FilesController < ApplicationController
     redirect_to project_files_path(@project)
   end
 
-  def showbyattachtype
-    sort_init 'created_on', 'desc'
-    sort_update   'created_on' => "#{Attachment.table_name}.created_on",
+  # 返回制定资源类型的资源列表
+  def getattachtype
+    sort_init 'created_on', 'desc' 
+    sort_update   'created_on' => "#{Attachment.table_name}.created_on", 
                   'filename' => "#{Attachment.table_name}.filename",
                   'size' => "#{Attachment.table_name}.filesize",
                   'downloads' => "#{Attachment.table_name}.downloads"
-
+   
     @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]     #modify by Long Jun
     @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+   
+    @attachtype = params[:type].to_i
+    @contenttype = params[:contentType].to_s
 
-    if @project.project_type == 1
-      render :layout => 'base_courses'
-    else
-      render :layout => !request.xhr?
+    respond_to do |format|
+      format.js
     end
   end
 end

app/controllers/projects_controller.rb

@@ -198,7 +198,7 @@ class ProjectsController < ApplicationController
     @project_type = params[:project_type]
     @school_id = params[:school_id]
     per_page_option = 10
-    if @school_id == "0" or @school.nil?
+    if @school_id == "0" or @school_id.nil?
       @projects_all = Project.active.visible.
                         joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id").
                         where("#{Project.table_name}.project_type = ? ", Project::ProjectType_course)    

app/controllers/school_controller.rb

@@ -23,7 +23,7 @@ class SchoolController < ApplicationController
       
     end    
   end  
-  
+
   def upload_logo
 
   end

app/helpers/files_helper.rb

@@ -44,9 +44,22 @@ module FilesHelper
     File.new(zipfile_name,'w+')
   end
 
-  def browseByCategory
-    isCategoryBrowser = 1
-    #isCategoryBrowser
+  # 判断指定的资源时候符合类型
+  def isTypeOk(attachment, type, contentType)
+    result = false
+    if type != 0
+      if attachment.attachtype == type
+        result = true
+      end
+    else
+      result = true
+    end
+    if  result
+      if    contentType != l(:attachment_all) && contentType != attachment.suffix_type
+        result = false
+         end
+    end
+    result
   end
 
 

app/helpers/projects_helper.rb

@@ -62,33 +62,33 @@ module ProjectsHelper
     content_tag('div', content, :class => "tabs_enterprise")   
   end
   
-   def sort_course(state, project_type)
+   def sort_course(state, project_type, school_id)
     content = ''.html_safe
     case state
     when 0
-      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type), :school_id => school_id, :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type, :school_id => school_id)))
       # content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type, :school_id => school_id)))
       
     when 1
-      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type, :school_id => school_id)))
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type, :school_id => school_id), :class=>"selected"), :class=>"selected")
       # content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type, :school_id => school_id)))
      
     when 2
-      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type, :school_id => school_id)))
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type, :school_id => school_id)))
       # content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type, :school_id => school_id)))
     
     #gcm
     when 3
-      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type)))
+      content << content_tag('li', link_to(l(:label_sort_by_time), course_path(:project_sort_type => '0', :project_type => project_type, :school_id => school_id)))
+      content << content_tag('li', link_to(l(:label_sort_by_active), course_path(:project_sort_type => '1', :project_type => project_type, :school_id => school_id)))
       # content << content_tag('li', link_to(l(:label_sort_by_influence), course_path(:project_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      content << content_tag('li', link_to(l(:label_sort_by_activity), course_path(:project_sort_type => '3', :project_type => project_type, :school_id => school_id), :class=>"selected"), :class=>"selected")
     end
     #gcmend
     

app/helpers/welcome_helper.rb

@@ -154,6 +154,12 @@ module WelcomeHelper
     sort_course_by_hot limit
   end
 
+  def find_all_new_hot_course limit = 9
+    #sort_project_by_hot_rails 1, 'course_ac_para DESC', limit
+    time_now = Time.new.strftime("%Y");
+    Project.visible.joins(:project_status).where("#{Project.table_name}.project_type = ? and #{Project.table_name}.created_on like '%#{time_now}%'", 1).order("course_ac_para DESC").limit(limit).all
+  end
+
   def find_all_hot_bid
     sort_bid_by_hot
   end

app/models/attachment.rb

@@ -66,6 +66,30 @@ class Attachment < ActiveRecord::Base
     copy
   end
 
+  #获取资源的后缀类型
+  def suffix_type
+    childArr = self.filename.split('.')
+    suffix = '*'
+    if childArr.length > 1
+      suffix = childArr[childArr.length-1]
+    end
+    suffix
+  end
+
+  #获取用来显示的后缀名称
+  def show_suffix_type
+    suffix = 'other'
+    temp = self.suffix_type.downcase
+    if self.attachmentstype.suffixArr.include?(temp)
+      suffix = temp
+    end
+    suffix
+  end
+
+  def suffixArr
+    @@SuffixArr
+  end
+
   def validate_max_file_size
     if @temp_file && self.filesize > Setting.attachment_max_size.to_i.kilobytes
       errors.add(:base, l(:error_attachment_too_big, :max_size => Setting.attachment_max_size.to_i.kilobytes))

app/models/attachmentstype.rb

@@ -1,4 +1,11 @@
 class Attachmentstype < ActiveRecord::Base
   attr_accessible :typeId, :typeName
   has_many  :attachments,  :foreign_key => "attachtype",:primary_key => "id"
+
+  # 当前使用的文件内容分类列表
+  @@SuffixArr = ['pdf','zip','doc','docx','rar','txt','jpg','bmp','xls','xlsx']
+
+  def suffixArr
+    @@SuffixArr
+  end
 end

app/models/mailer.rb

@@ -63,7 +63,7 @@ class Mailer < ActionMailer::Base
   #   Mailer.issue_add(issue).deliver => sends an email to issue recipients
   def issue_add(issue)
     redmine_headers 'Project' => issue.project.identifier,
-                    'Issue-Id' => issue.id,
+                    'Issue-Id' => (issue.project.issues.index(issue).to_i + 1).to_s,
                     'Issue-Author' => issue.author.login
     redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
     message_id issue
@@ -85,7 +85,7 @@ class Mailer < ActionMailer::Base
   def issue_edit(journal)
     issue = journal.journalized.reload
     redmine_headers 'Project' => issue.project.identifier,
-                    'Issue-Id' => issue.id,
+                    'Issue-Id' =>  (issue.project.issues.index(issue).to_i + 1).to_s,
                     'Issue-Author' => issue.author.login
     redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
     message_id journal

app/models/project.rb

@@ -164,6 +164,14 @@ class Project < ActiveRecord::Base
     @attachmenttypes = Attachmentstype.find(:all, :conditions => ["#{Attachmentstype.table_name}.typeId= ?",self.attachmenttype ])
   end
 
+  # 获取资源后缀名列表
+  def contenttypes
+    attachmenttypes
+    if  @attachmenttypes.length >0
+      @attachmenttypes.last().suffixArr
+    end
+  end
+
   #自定义验证
   def validation
     if  !class_period.match([0-9])

app/views/files/_new.html.erb

@@ -13,7 +13,7 @@
 
   <% if attachmenttypes.any? %>
       <p>      <label for="attachment_type"><%=l(:attachment_type)%></label>
-        <%= select_tag "attachment_type", content_tag('option', '') +
+        <%= select_tag "attachment_type",
                 options_from_collection_for_select(attachmenttypes, "id",
                                                    "typeName") %>
       </p>

app/views/files/_show_all_attachment.html.erb

@@ -0,0 +1,64 @@
+<% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
+<% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
+  <ul id="all_browse_ul">
+    <table class="list files" id="ver-zebra" >
+      <colgroup>
+        <col class="vzebra-odd" />
+        <col class="vzebra-even" />
+        <col class="vzebra-odd" />
+        <col class="vzebra-even" />
+        <col class="vzebra-odd" />
+      </colgroup>
+      <thead><tr>
+        <%= sort_header_tag('filename', :caption => l(:field_filename), :scope =>"col" , :id => "vzebra-adventure")%>
+        <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope =>"col" , :id => "vzebra-comedy")%>
+        <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope =>"col", :id=> "vzebra-children")%>
+        <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope =>"col", :id=> "vzebra-attachmenttype")%>
+        <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope =>"col", :id=> "vzebra-contenttype")%>
+        <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope =>"col", :id => "vzebra-action") %>
+        <%= sort_header_tag('operation', :caption => "", :scope =>"col", :id => "vzebra-children") %>
+        <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
+      </tr></thead>
+      <tbody>
+      <% @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;") %>
+                </th>
+              </tr>
+          <% end -%>
+          <% container.attachments.each do |file| %>
+              <tr class="file <%= cycle("odd", "odd") %>">
+                <td class="filename" style="font-size: 13px; width: 240px; "><%= 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"><%= file.attachmentstype.typeName %></td>
+                <td class="content_type"><%= file.show_suffix_type %></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="5">
+                  <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 %>
+      <% end -%>
+      <!-- %= h downloadAll(@containers) % -->
+      <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
+
+      </tbody>
+    </table>
+  </ul>

app/views/files/_sort_by_attachtypel.html.erb

@@ -0,0 +1,66 @@
+<% selAttachType =@attachtype %>
+<% selContentType =@contenttype %>
+<% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
+<% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
+<div id="catarory_browse_div" class="catarory_browse_div">
+  <ul id="catarory_browse_ul">
+    <table class="list files" id="ver-zebra1">
+      <colgroup>
+        <col class="vzebra-odd"/>
+        <col class="vzebra-even"/>
+        <col class="vzebra-odd"/>
+        <col class="vzebra-even"/>
+        <col class="vzebra-odd"/>
+      </colgroup>
+      <thead>
+      <tr>
+        <%= sort_header_tag('filename', :caption => l(:field_filename), :scope => "col", :id => "vzebra-adventure") %>
+        <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope => "col", :id => "vzebra-comedy") %>
+        <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope => "col", :id => "vzebra-children") %>
+        <%= sort_header_tag('attach_type', :caption => l(:attachment_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-attachmenttype") %>
+        <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope =>"col", :id=> "vzebra-contenttype")%>
+        <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
+        <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
+        <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
+      </tr>
+      </thead>
+      <tbody>
+      <% @containers.each do |container| %>
+          <% next if container.attachments.empty? -%>
+          <% container.attachments.each do |file| %>
+              <% if isTypeOk(file,selAttachType,selContentType) %>
+                  <tr class="file <%= cycle("odd", "odd") %>">
+                    <td class="filename" style="font-size: 13px; width: 240px; "><%= 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"><%= file.attachmentstype.typeName %></td>
+                    <td class="content_type"><%= file.show_suffix_type %></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="5">
+                      <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>
+  </ul>
+</div>

app/views/files/getattachtype.js.erb

@@ -0,0 +1,5 @@
+     <% if @attachtype==0 && @contenttype==l(:attachment_all)%>
+     $("#all_browse_div").html('<%= j(render partial: "show_all_attachment")%>');
+     <%else%>
+     $("#all_browse_div").html('<%= j(render partial: "sort_by_attachtypel")%>');
+     <%end%>

app/views/files/index.html.erb

@@ -1,7 +1,6 @@
 <!-- <h3> --><!-- %=l(:label_attachment_plural)%></h3 -->
-<%isCategoryBrowser=false%>
-<% selAttachType =1%>
 <% attachmenttypes = @project.attachmenttypes %>
+<% sufixtypes = @project.contenttypes %>
 <style>
     #ver-zebra, .file_table_des
     {
@@ -185,10 +184,17 @@
     <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>
 
     <% if attachmenttypes.any? %>
-          <label for="attachment_browse"><%=l(:attachment_browse)%></label>
-          <%= select_tag "attachment_browse", content_tag('option', '') +options_from_collection_for_select(attachmenttypes, "id", "typeName"),
-                         :onchange=>"attachmenttypes_search(this.value)"%>
+        &nbsp; &nbsp; &nbsp;
+          <label for="attachment_browse_label"><%=l(:attachment_browse)%></label>
+          <%= select_tag "attachment_browse", content_tag('option',l(:attachment_all)) +options_from_collection_for_select(attachmenttypes, "id", "typeName"),
+                         :onchange=>"attachmenttypes_searchex(this.value)"%>
      <% end %>
+     <% if sufixtypes.any? %>
+        &nbsp;
+        <label for="attach_sufix_browse_label"><%=l(:attachment_sufix_browse)%></label>
+        <%= select_tag "attach_sufix_browse", content_tag('option', l(:attachment_all)) +options_for_select(sufixtypes),
+                       :onchange=>"attachment_contenttypes_searchex(this.value)"%>
+    <% end %>
 
     <div id="upload_file_div" class="relation_file_div hidden" >
       <%= render :partial => 'new', locals: {project: @project}%>
@@ -200,8 +206,8 @@
                     attachments_autocomplete_path(:format => 'js'),
                     :remote => true,
                     :method => :post) do %>
-            <%= label_tag(:attach_search, "按关键字搜索:") %>
-            <%= text_field_tag(:attach_search) %>
+            <%= label_tag(:atext_field_tagttach_search, "按关键字搜索:") %>
+            <%= (:attach_search) %>
             <%#= submit_tag("Search") %>
         <% end -%>
         <%= form_tag attach_relation_path(:format => 'js'),
@@ -228,128 +234,10 @@
 
 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
 
-<%if !isCategoryBrowser%>
 <div id="all_browse_div" class="all_browse_div" >
- <ul id="all_browse_ul">
-  <table class="list files" id="ver-zebra" >
-    <colgroup>
-      <col class="vzebra-odd" />
-      <col class="vzebra-even" />
-      <col class="vzebra-odd" />
-      <col class="vzebra-even" />
-      <col class="vzebra-odd" />
-    </colgroup>
-    <thead><tr>
-      <%= sort_header_tag('filename', :caption => l(:field_filename), :scope =>"col" , :id => "vzebra-adventure")%>
-      <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope =>"col" , :id => "vzebra-comedy")%>
-      <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope =>"col", :id=> "vzebra-children")%>
-      <%= sort_header_tag('attach_type', :caption => l(:attachment_type), :default_order => 'desc', :scope =>"col", :id=> "vzebra-attachmenttype")%>
-      <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope =>"col", :id => "vzebra-action") %>
-      <%= sort_header_tag('operation', :caption => "", :scope =>"col", :id => "vzebra-children") %>
-      <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
-    </tr></thead>
-    <tbody>
-    <% @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;") %>
-              </th>
-            </tr>
-        <% end -%>
-        <% container.attachments.each do |file| %>
-            <tr class="file <%= cycle("odd", "odd") %>">
-              <td class="filename" style="font-size: 13px; width: 240px; "><%= 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"><%= file.attachmentstype.typeName %></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="5">
-                <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 %>
-    <% end -%>
-    <!-- %= h downloadAll(@containers) % -->
-    <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
-
-    </tbody>
-  </table>
-</ul>
+  <%= render :partial => 'show_all_attachment'%>
 </div>
-<%else%>
-<div id="catarory_browse_div" class="catarory_browse_div" >
-  <ul id="catarory_browse_ul">
-    <table class="list files" id="ver-zebra1" >
-      <colgroup>
-        <col class="vzebra-odd" />
-        <col class="vzebra-even" />
-        <col class="vzebra-odd" />
-        <col class="vzebra-even" />
-        <col class="vzebra-odd" />
-      </colgroup>
-      <thead><tr>
-        <%= sort_header_tag('filename', :caption => l(:field_filename), :scope =>"col" , :id => "vzebra-adventure")%>
-        <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope =>"col" , :id => "vzebra-comedy")%>
-        <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope =>"col", :id=> "vzebra-children")%>
-        <%= sort_header_tag('attach_type', :caption => l(:attachment_type), :default_order => 'desc', :scope =>"col", :id=> "vzebra-attachmenttype")%>
-        <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope =>"col", :id => "vzebra-action") %>
-        <%= sort_header_tag('operation', :caption => "", :scope =>"col", :id => "vzebra-children") %>
-        <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
-      </tr></thead>
-      <tbody>
-      <% @containers.each do |container| %>
-          <% next if container.attachments.empty? -%>
-          <% container.attachments.each do |file| %>
-             <% if file.attachtype==selAttachType%>
-              <tr class="file <%= cycle("odd", "odd") %>">
-                <td class="filename" style="font-size: 13px; width: 240px; "><%= 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"><%= file.attachmentstype.typeName %></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="5">
-                  <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>
-</ul>
-</div>
- <%end%>
 <% html_title(l(:label_attachment_plural)) -%>
 
 <script type='text/javascript'>
@@ -396,18 +284,37 @@
 
  </script>
 
-<%inited=false%>
+
 <script type="text/javascript">
-    function attachmenttypes_search(value){
+    function attachmenttypes_searchex(value) {
         $.ajax({
-                     <%if inited%>
-                    <% @isCategoryBrowser=!isCategoryBrowser%>
-                    <%@selAttachType=value%>
-                    <%= render :partial => 'new', locals: {isCategoryBrowser:@isCategoryBrowser,selAttachType:@selAttachType} %>
-                      <%end%>
-                    <%inited = true%>
-                }
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>' + '?type='
+                    + encodeURIComponent(value) + "&contentType=" + $('#attach_sufix_browse').val(),
+            type: "POST"
+
+        }).complete(function (xhr, textStatus) {
+                    if (textStatus == 'success') {
+                        eval(xhr.responseText);
+                    } else if (textStatus == 'error') {
+                        alert('error');
+                    }
+                });
+    }
+
+    function attachment_contenttypes_searchex(value) {
+        $.ajax({
+
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>' + '?type='
+                    + $('#attachment_browse').val() + "&contentType=" + encodeURIComponent(value),
+            type: "POST"
 
-        )
+        }).complete(function (xhr, textStatus) {
+                    if (textStatus == 'success') {
+                        eval(xhr.responseText);
+                    } else if (textStatus == 'error') {
+                        alert('error');
+                    }
+                    ;
+                });
     }
 </script>

app/views/projects/course.html.erb

@@ -30,7 +30,7 @@
 	</table>
 	<% end %>
 </div>
-<%= sort_course(@s_type, @project_type)%>
+<%= sort_course(@s_type, @project_type, @school_id)%>
 
 <div id="projects-index">
 	<%= render_project_hierarchy(@projects)%>

config/environment.rb

@@ -10,5 +10,6 @@ if Dir.glob(File.join(vendor_plugins_dir, "*")).any?
   exit 1
 end
 
+
 # Initialize the rails application
 RedmineApp::Application.initialize!

config/locales/en.yml

@@ -132,8 +132,10 @@ en:
 
   actionview_instancetag_blank_option: Please select
 
-  attachment_browse: 'Attachment Browse'
-  attachment_type: 'Attachment Type'
+  attachment_all: "All"
+  attachment_browse: "Attachment Content Browse"
+  attachment_sufix_browse: "Attachment Type Browse"
+  attachment_type: "Attachment Type"
   general_text_No: 'No'
   general_text_Yes: 'Yes'
   general_text_no: 'no'

config/locales/zh.yml

@@ -140,7 +140,9 @@ zh:
 
   actionview_instancetag_blank_option: 请选择
 
-  attachment_browse: '分类浏览'
+  attachment_all: "全部"
+  attachment_sufix_browse: "文件类型"
+  attachment_browse: "内容类型"
   attachment_type: '资源分类'
   general_text_No: '否'
   general_text_Yes: '是'

config/routes.rb

@@ -19,7 +19,7 @@ RedmineApp::Application.routes.draw do
   resources :no_uses
   delete 'no_uses', :to => 'no_uses#delete'
 
-  resources :apply_project_masters
+   resources :apply_project_masters
   delete 'apply_project_masters', :to => 'apply_project_masters#delete'
 
 
@@ -299,7 +299,12 @@ RedmineApp::Application.routes.draw do
     # issue form update
     match 'issues/update_form', :controller => 'issues', :action => 'update_form', :via => [:put, :post], :as => 'issue_form'
 
-    resources :files, :only => [:index, :new, :create,:showbyattachtype]
+    resources :files, :only => [:index, :new, :create] do
+      collection do
+        match "getattachtype" , via: [:get, :post]
+        #match 'getattachtype/:attachtype', :to => 'files#getattachtype', via: [:get, :post]
+      end
+    end
 
     resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
       collection do