From 03318aac97d23e101926b693f2dc152e9d419a92 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Dec 2015 15:36:59 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E4=BF=AE=E6=94=B9=E8=A6=81=E5=8F=98=E6=88=90=E7=81=B0?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index fa9171496..b95c8f049 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -30,7 +30,7 @@
           <li>&nbsp;&nbsp;</li>
         </ul>
         <ul class="setting_right ">
-          <li><%= f.text_field :login,:no_label=>true, :required => true, :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
+          <li><%= f.text_field :login,:no_label=>true, :required => true,:style=>"color:grey", :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
           <li><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>
 
           <li>

From b981f3dcea5d203595baf07d4ec1aab38d339588 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Dec 2015 15:39:38 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4403=E9=97=AE=E9=A2=98=20=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 2 +-
 app/views/courses/settings.html.erb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 88aae0f8b..ab2cfa2ba 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -30,7 +30,7 @@ class ProjectsController < ApplicationController
   before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_project]
   before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
   before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
-  before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
+  before_filter :require_admin, :only => [ :copy, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics #:watcherlist
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
   # before_filter :memberAccess, only: :member
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 650127aef..634f26495 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -89,7 +89,7 @@
       <% end %>
     </ul>
     <% if @course.is_delete == 1 %>
-        <div class="mt30 fr"><img src="/images/pic_del.gif" class="mr5"><%=link_to "恢复该课程", renew_course_path(@course) %></div>
+        <div class="mt30"><%=link_to "恢复该课程", renew_course_path(@course) %></div>
     <% else %>
         <div class="mt30">
           <img src="/images/pic_del.gif" class="mr5"><%=link_to "删除该课程", course_path(@course), :method => :delete, :confirm=>"确认要删除该课程吗？"  %>

From d1423ebc7ed268b2d9526093185bd68504d241b3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Dec 2015 15:41:41 +0800
Subject: [PATCH 03/11] =?UTF-8?q?ke=E9=AB=98=E5=BA=A6=E5=B0=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/init_activity_KindEditor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index 977c62117..a23b83607 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -159,4 +159,5 @@ function init_activity_KindEditor_data(id){
 
     div_form = $("div[nhname='new_message_" + id + "']");
     $(".ke-edit", div_form).css("height","33px");
+    $(".ke-edit-iframe",div_form).css("height","33px");
 }
\ No newline at end of file

From b178fb7f0a318b1f65dc600c09e74fe4d4b40031 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Dec 2015 15:56:37 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92=20?=
 =?UTF-8?q?=E7=97=85=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 1ca8f5e1a..9f7b90ee4 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -180,7 +180,7 @@
           <div  style="display: none" class="message_title_red system_message_style">
             <p>
               <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              该作业已经被关闭了匿评。作业信息如下：
+              该作业已经关闭了匿评。作业信息如下：
             </p>
             <ul class="ul_grey">
               <li>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>

From e98338bf22579e2a87c4f61be1178edd3e41f85e Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 11 Dec 2015 16:30:50 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6=E3=80=81=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E3=80=81=E6=98=BE=E7=A4=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb     |  2 +
 app/controllers/attachments_controller.rb     |  2 +
 app/controllers/files_controller.rb           | 37 ++++++-
 app/controllers/org_subfields_controller.rb   |  4 +
 app/helpers/files_helper.rb                   |  3 +-
 app/models/attachment.rb                      |  1 +
 app/models/org_subfield.rb                    |  5 +
 app/views/files/_attachement_list.html.erb    | 19 ++++
 app/views/files/_org_subfield_list.html.erb   | 56 +++++++++++
 app/views/files/_subfield_files.html.erb      | 97 +++++++++++++++++++
 app/views/files/_subfield_files_list.html.erb | 55 +++++++++++
 .../files/_upload_subfield_file.html.erb      | 31 ++++++
 app/views/files/create.js.erb                 | 11 +++
 app/views/files/index.html.erb                |  6 +-
 app/views/org_subfields/_resource.html.erb    | 96 ++++++++++++++++++
 .../_org_left_subfield_list.html.erb          |  2 +-
 config/routes.rb                              | 12 ++-
 public/stylesheets/courses.css                |  6 +-
 public/stylesheets/org.css                    | 15 ++-
 19 files changed, 452 insertions(+), 8 deletions(-)
 create mode 100644 app/views/files/_org_subfield_list.html.erb
 create mode 100644 app/views/files/_subfield_files.html.erb
 create mode 100644 app/views/files/_subfield_files_list.html.erb
 create mode 100644 app/views/files/_upload_subfield_file.html.erb
 create mode 100644 app/views/org_subfields/_resource.html.erb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6387a97a4..cbf2c30bb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -418,6 +418,8 @@ class ApplicationController < ActionController::Base
       @project = Project.find(params[:project_id])
     elsif params[:course_id]
       @course = Course.find(params[:course_id])
+    elsif params[:org_subfield_id]
+      @org_subfield = OrgSubfield.find(params[:org_subfield_id])
     end
   rescue ActiveRecord::RecordNotFound
      render_404
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 37182dbcf..d371ed4cb 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -240,6 +240,8 @@ class AttachmentsController < ApplicationController
         format.html { redirect_to_referer_or respond_path(@attachment.container) }
       elsif !@attachment.container.nil? && @attachment.container.is_a?(PhoneAppVersion)
         format.html { redirect_to_referer_or mobile_version_path }
+      elsif !@attachment.container.nil? && @attachment.container.is_a?(OrgSubfield)
+        format.html {redirect_to_referer_or org_subfield_files_path(@attachment.container)}
       else
          if @project.nil?
            format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index c894680a6..328446fbb 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -299,6 +299,10 @@ class FilesController < ApplicationController
       render :layout => 'base_courses'
     elsif params[:org_subfield_id]
       @container_type = 2
+      @organization = Organization.find(params[:organization_id])
+      @containers = [ OrgSubfield.includes(:attachments).reorder(sort).find(@org_subfield.id)]
+      show_attachments @containers
+      render :layout => 'base_org'
       # @subfield = params[:org_subfield_id]
     end
 
@@ -424,8 +428,39 @@ class FilesController < ApplicationController
            redirect_to course_files_url(@course)
          }
        end
-     end
+     elsif @org_subfield
+       @addTag=false
+       # if params[:in_org_subfield_toolbar]
+       #   @in_org_subfield_toolbar = params[:in_org_subfield_toolbar]
+       # end
+       attachments = Attachment.attach_filesex(@org_subfield, params[:attachments], params[:org_subfield_attachment_type])
 
+       # if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
+       #   Mailer.run.attachments_added(attachments[:files])
+       # end
+
+       # TODO: 临时用 nyan
+       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 = [OrgSubfield.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@org_subfield.id)] #modify by Long Jun
+       # @containers += @org_subfield.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+
+       show_attachments @containers
+
+       @attachtype = 0
+       @contenttype = 0
+
+       respond_to do |format|
+         format.js
+         format.html {
+           redirect_to org_subfield_files_url(@org_subfield)
+         }
+       end
+     end
    end
   end
 
diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 00b88fdaa..1dc7885fe 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -17,4 +17,8 @@ class OrgSubfieldsController < ApplicationController
     @organization = Organization.find(@subfield.organization_id)
     @subfield.update_attributes(:name => params[:name])
   end
+
+  def show
+    
+  end
 end
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index 9a1765ddc..cf9cbcc32 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -113,7 +113,8 @@ module FilesHelper
       if attachment.is_public? ||
           (attachment.container_type == "Project" && User.current.member_of?(attachment.project)) ||
           (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)))||
-          attachment.author_id == User.current.id
+          attachment.author_id == User.current.id ||
+          attachment.container_type == "OrgSubfield"
         result << attachment
       end
     end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 999cefdaa..57b6af0ce 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -22,6 +22,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :container, :polymorphic => true
   belongs_to :project, foreign_key: 'container_id', conditions: "attachments.container_type = 'Project'"
   belongs_to :course, foreign_key: 'container_id', conditions: "attachments.container_type = 'Course'"
+  belongs_to :org_subfield, foreign_key: 'container_id', conditions: "attachements.container_type = 'OrgSubfield'"
   belongs_to :softapplication, foreign_key: 'container_id', conditions: "attachments.container_type = 'Softapplication'"
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"
diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index efe9699c3..f95bb3eba 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -1,4 +1,9 @@
 class OrgSubfield < ActiveRecord::Base
   belongs_to :organization, :foreign_key => :organization_id
   has_many :org_document_comments, :dependent => :destroy
+  has_many :files
+  acts_as_attachable
+
+  def project
+  end
 end
\ No newline at end of file
diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb
index 25cc7f68a..a9d399511 100644
--- a/app/views/files/_attachement_list.html.erb
+++ b/app/views/files/_attachement_list.html.erb
@@ -20,6 +20,25 @@
                                :lebel_file_uploding => l(:lebel_file_uploding),
                                :delete_all_files => l(:text_are_you_sure_all)
                        } %>
+<% elsif @project %>
+    <%= file_field_tag 'attachments[dummy][file]',
+                       :id => '_file',
+                       :class => ie8? ? '':'file_selector',
+                       :multiple => true,
+                       :onchange => 'addInputFiles(this);',
+                       :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'),
+                               :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)
+                       } %>
 <% else %>
     <%= file_field_tag 'attachments[dummy][file]',
                        :id => '_file',
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
new file mode 100644
index 000000000..a8aa13458
--- /dev/null
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -0,0 +1,56 @@
+<% delete_allowed = User.current.admin? %>
+<div class="re_con_top">
+  <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
+  <p class="f_r" style="color: #808080">
+    <% if order == "asc" %>
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+    <% else %>
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+    <% end %>
+  </p>
+</div>
+<div class="cl"></div>
+
+<!--<div class="files_tag" id="files_tag">-->
+  <!--<%#= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>-->
+<!--</div>-->
+<div class="cl"></div>
+
+<div class="for_img_thumbnails">
+  <% org_subfield_attachments.each do |file| %>
+      <% if 1 %>
+          <div class="re_con_box" id="container_files_<%= file.id %>">
+            <div class="">
+              <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                          download_named_attachment_path(file.id, file.filename),
+                          :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+              <% if User.current.logged? %>
+                  <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %>
+              <% end %>
+            </div>
+            <div class="cl"></div>
+            <div class="mt5">
+              <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
+              <%= link_to( l(:button_delete), attachment_path(file),
+                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @org_subfield.id && file.container_type == "OrgSubfield"%>
+              <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
+            </div>
+            <div class="cl"></div>
+            <!--<div class="tag_h">-->
+              <!--&lt;!&ndash; container_type = 1 代表是课程里的资源 &ndash;&gt;-->
+              <!--<%#= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>-->
+              <!--<%#= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>-->
+            <!--</div>-->
+            <div class="cl"></div>
+          </div><!---re_con_box end-->
+      <% end %>
+  <% end %>
+</div>
+<ul class="wlist">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+</ul>
+<div class="cl"></div>
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
new file mode 100644
index 000000000..ea408c7a6
--- /dev/null
+++ b/app/views/files/_subfield_files.html.erb
@@ -0,0 +1,97 @@
+<%= stylesheet_link_tag 'courses' %>
+<script>
+    function searchone4reload(fileid){
+        var url = "<%= searchone4reload_org_subfield_files_path(@org_subfield)%>";
+        var data = {};data.fileid=fileid;
+        $.ajax({
+            url:url,dataType:'text',data:data,success:function(text){
+                var container_file_div = $("#container_files_"+fileid);
+                container_file_div.after(text);
+                container_file_div.remove();
+            }
+        });
+    }
+    function show_upload(obj)
+    {
+        switch(obj)
+        {
+            case 1:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 1}) %>');
+                break;
+            case 2:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 2}) %>');
+                break;
+            case 3:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 3}) %>');
+                break;
+            case 4:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 4}) %>');
+                break;
+            case 6:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 6}) %>');
+                break;
+            default:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_subfield_file',:locals => {:org_subfield => @org_subfield,:org_subfield_attachment_type => 5}) %>');
+        }
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function closeModal()
+    {
+        hideModal($("#popbox_upload"));
+    }
+
+    function presscss(id)
+    {
+        if(id == "inorg_subfield")
+        {
+            $('#inorg_subfield').attr("class", "re_schbtn b_dblue");
+            $('#insite').attr("class", "re_schbtn b_lblue");
+        }
+        else
+        {
+            $('#inorg_subfield').attr("class", "re_schbtn b_lblue");
+            $('#insite').attr("class", "re_schbtn b_dblue");
+        }
+    }
+    function buttoncss()
+    {
+        $('#inorg_subfield').attr("class", "re_schbtn b_lblue");
+        $('#insite').attr("class", "re_schbtn b_lblue");
+    }
+</script>
+
+<div class="container">
+  <div class="resources"><!--资源库内容开始--->
+    <div class="re_top" style="width:710px;">
+      <%= form_tag( search_org_subfield_files_path(@org_subfield), method: 'get',:class => "re_search f_l",:remote=>true) do %>
+          <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
+          <%= submit_tag "栏目内搜索", :class => "re_schbtn b_lblue",:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+      <% end %>
+      <%# if is_org_subfield_teacher(User.current,@org_subfield) || (@org_subfield.publish_resource==1 && User.current.member_of_org_subfield?(@org_subfield) ) %>  <!-- show_window('light','fade','20%','35%')-->
+          <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
+          <p class="c_grey fr mt10 mr5">
+            上传：
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(1);">课件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(2);">软件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(3);">媒体</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(4);">代码</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(6);">论文</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(5);">其他</a>
+          </p>
+      <%# end %>
+    </div><!---re_top end-->
+    <div class="cl"></div>
+
+    <div class="re_con" id="org_subfield_list">
+      <%= render :partial => 'org_subfield_list',:locals => {org_subfield: @org_subfield,all_attachments: @all_attachments,sort:@sort,order:@order,org_subfield_attachments:@obj_attachments}  %>
+    </div><!---re_con end-->
+
+  </div>
+</div>
+<% html_title(l(:label_attachment_plural)) -%>
\ No newline at end of file
diff --git a/app/views/files/_subfield_files_list.html.erb b/app/views/files/_subfield_files_list.html.erb
new file mode 100644
index 000000000..d762743ad
--- /dev/null
+++ b/app/views/files/_subfield_files_list.html.erb
@@ -0,0 +1,55 @@
+<% delete_allowed = User.current.admin? %>
+<div class="re_con_top">
+  <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
+  <p class="f_r" style="color: #808080">
+    <% if order == "asc" %>
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:desc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp;/&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:desc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+    <% else %>
+        按&nbsp;<%= link_to "时间",params.merge(:sort=>"created_on:asc"),:class => "f_b c_grey" ,:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"created_on"} %>&nbsp;/&nbsp;
+        <%= link_to "下载次数",params.merge(:sort=>"downloads:asc"),:class => "f_b c_grey",:remote => @is_remote  %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"downloads"} %>&nbsp; /&nbsp;
+        <%= link_to "引用次数",params.merge(:sort=>"quotes:asc"),:class => "f_b c_grey",:remote => @is_remote %><%= render partial: 'files/arrow_show',locals: { sort: sort,order:order,current:"quotes"} %>&nbsp;排序
+    <% end %>
+  </p>
+</div>
+<div class="cl"></div>
+
+<div class="files_tag" id="files_tag">
+  <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>
+</div>
+<div class="cl"></div>
+
+<div class="for_img_thumbnails">
+  <% curse_attachments.each do |file| %>
+      <% if file.is_public? || User.current.admin? %>
+          <div class="re_con_box" id="container_files_<%= file.id %>">
+            <div class="">
+              <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                          download_named_attachment_path(file.id, file.filename),
+                          :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+            </div>
+            <div class="cl"></div>
+            <div class="mt5">
+              <p class="f_l mb5 c_grey02">文件大小：<%= number_to_human_size(file.filesize) %></p>
+              <%= link_to( l(:button_delete), attachment_path(file),
+                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @org_subfield.id && file.container_type == "OrgSubfield"%>
+              <p class="f_r c_grey02" ><%= time_tag(file.created_on).html_safe %><%= l(:label_bids_published_ago) %>&nbsp;&nbsp;|&nbsp;&nbsp;下载<%= file.downloads %>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
+            </div>
+            <div class="cl"></div>
+            <div class="tag_h">
+              <!-- container_type = 1 代表是课程里的资源 -->
+              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+              <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+            </div>
+            <div class="cl"></div>
+          </div><!---re_con_box end-->
+      <% else %>
+          <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
+      <% end %>
+  <% end %>
+</div>
+<ul class="wlist">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+</ul>
+<div class="cl"></div>
diff --git a/app/views/files/_upload_subfield_file.html.erb b/app/views/files/_upload_subfield_file.html.erb
new file mode 100644
index 000000000..c3ca72ecd
--- /dev/null
+++ b/app/views/files/_upload_subfield_file.html.erb
@@ -0,0 +1,31 @@
+
+<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
+  <div class="upload_con">
+    <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
+    <div class="upload_box">
+      <%= error_messages_for 'attachment' %>
+      <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
+
+      <%= form_tag(org_subfield_files_path(org_subfield), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+          <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
+          <!--<input type="hidden" name="in_org_subfield_toolbar" value="Y">-->
+          <input type="hidden" name="org_subfield_attachment_type" value="<%= org_subfield_attachment_type%>">
+          <%= render :partial => 'files/attachement_list',:locals => {:org_subfield => org_subfield} %>
+          <div class="cl"></div>
+          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
+      <% end %>
+    </div>
+
+  </div>
+  <% content_for :header_tags do %>
+      <%= javascript_include_tag 'attachments' %>
+  <% end %>
+</div>
+
+<script>
+    function submit_resource()
+    {
+        $('#submit_resource').parent().submit();
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index 9de7aa042..4d8bb26ca 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -52,6 +52,17 @@ $('#upload_file_div').slideToggle('slow');
             setTimeout( function(){div.remove();},3000)
         <% end %>
     <%end%>
+    <% elsif @org_subfield %>
+        hideModal();
+        $("#resource_list").html('<%= j(render partial:  "subfield_files" ,locals: {org_subfield: @org_subfield}) %>');
+//        $("#courses_files_count_info").html("<%#= @all_attachments.count%>");
+//        $("#courses_files_count_nav").html("(<%#= @all_attachments.count%>)")
+        //    添加文件上传成功提示,
+        <% unless params[:attachments].nil? %>
+            var div = $('<div id="addBox" class="flash notice">文件上传成功！</div>');
+            $("#org_subfield_list").prepend(div);
+            setTimeout( function(){div.remove();},3000)
+        <% end %>
   <% end %>
 <% end %>
 $(document).ready(img_thumbnails);
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 3dad88868..d442b9112 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -1,8 +1,10 @@
 <div id="resource_list">
-  <% if @isproject %>
+  <% if @container_type == 0 %>
       <%= render :partial => 'project_file_new', locals: {project: @project} %>
-  <% else %>
+  <% elsif @container_type == 1 %>
       <%= render :partial => 'course_file', locals: {course: @course} %>
+      <% elsif @container_type == 2 %>
+      <%= render :partial => 'files/subfield_files', locals: {org_subfield: @org_subfield} %>
   <% end %>
 </div>
 
diff --git a/app/views/org_subfields/_resource.html.erb b/app/views/org_subfields/_resource.html.erb
new file mode 100644
index 000000000..3cce9748f
--- /dev/null
+++ b/app/views/org_subfields/_resource.html.erb
@@ -0,0 +1,96 @@
+<script>
+    function searchone4reload(fileid){
+        var url = "<%= searchone4reload_course_files_path(@course)%>";
+        var data = {};data.fileid=fileid;
+        $.ajax({
+            url:url,dataType:'text',data:data,success:function(text){
+                var container_file_div = $("#container_files_"+fileid);
+                container_file_div.after(text);
+                container_file_div.remove();
+            }
+        });
+    }
+    function show_upload(obj)
+    {
+        switch(obj)
+        {
+            case 1:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 1}) %>');
+                break;
+            case 2:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 2}) %>');
+                break;
+            case 3:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 3}) %>');
+                break;
+            case 4:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 4}) %>');
+                break;
+            case 6:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 6}) %>');
+                break;
+            default:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 5}) %>');
+        }
+        showModal('ajax-modal', '513px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().addClass("popbox_polls");
+    }
+
+    function closeModal()
+    {
+        hideModal($("#popbox_upload"));
+    }
+
+    function presscss(id)
+    {
+        if(id == "incourse")
+        {
+            $('#incourse').attr("class", "re_schbtn b_dblue");
+            $('#insite').attr("class", "re_schbtn b_lblue");
+        }
+        else
+        {
+            $('#incourse').attr("class", "re_schbtn b_lblue");
+            $('#insite').attr("class", "re_schbtn b_dblue");
+        }
+    }
+    function buttoncss()
+    {
+        $('#incourse').attr("class", "re_schbtn b_lblue");
+        $('#insite').attr("class", "re_schbtn b_lblue");
+    }
+</script>
+
+<div class="container">
+  <div class="resource"><!--资源库内容开始--->
+    <div class="re_top">
+      <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search f_l",:remote=>true) do %>
+          <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%>
+          <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %>
+          <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
+      <% end %>
+      <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>  <!-- show_window('light','fade','20%','35%')-->
+          <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
+          <p class="c_grey fr mt10 mr5">
+            上传：
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(1);">课件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(2);">软件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(3);">媒体</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(4);">代码</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(6);">论文</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue font_bold" onclick="show_upload(5);">其他</a>
+          </p>
+      <% end %>
+    </div><!---re_top end-->
+    <div class="cl"></div>
+
+    <div class="re_con" id="course_list">
+      <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}  %>
+    </div><!---re_con end-->
+
+  </div>
+</div>
+<% html_title(l(:label_attachment_plural)) -%>
\ No newline at end of file
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 57ea46658..dbeaa6117 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -29,7 +29,7 @@
         <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
         <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
       <% else %>
-        <%#= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
+        <%= link_to "#{field.name}", org_subfield_files_path(field, :organization_id => organization.id), :class => "homepageMenuText" %>
       <% end %>
     </div>
     <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">
diff --git a/config/routes.rb b/config/routes.rb
index 15e41955d..95a0cf856 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,7 +72,17 @@ RedmineApp::Application.routes.draw do
   end
 
   resources :org_subfields do
-
+    resources :files, :only => [:index, :new, :create] do
+      collection do
+        match "getattachtype", :via =>  [:get, :post]
+        match "search",:via => [:post,:get]
+        match "searchone4reload",:via => [:post,:get]
+        match "search_tag_attachment", :via => [:post,:get]
+      end
+      member do
+        match "quote_resource_show", :via => [:get]
+      end
+    end
   end
 
   resources :org_document_comments do
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 54e550426..18f0e600c 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1213,4 +1213,8 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .uploadKeyword {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:280px;}
 .mb10 {margin-bottom: 10px}
 .mb15 {margin-bottom: 15px}
-div.disable_link {background-color: #c1c1c1 !important;}
\ No newline at end of file
+div.disable_link {background-color: #c1c1c1 !important;}
+
+/*新课程资源库*/
+.reCon{ margin:5px; width:710px;}
+.reTop{width:710px; height:40px; background:#eaeaea; padding:5px;}
\ No newline at end of file
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index c46cfc6e2..584f1bafa 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -70,4 +70,17 @@ a.linkGrey8:hover {color:#585858;}
 .org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
 #orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
 
-.orgListStatus {width:55px; float:left;}
\ No newline at end of file
+.orgListStatus {width:55px; float:left;}
+.reCon{ margin:5px; width:710px;}
+.retop{width:710px; height:40px; background:#eaeaea; padding:5px;}
+.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
+.re_search{ margin-top:7px; margin-left:5px;}
+.re_search{ margin-top:7px; margin-left:5px;}
+.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
+.re_schbtn{ width:60px; height:26px;  color:#fff; margin-right:5px; border:none;  margin-left:0px;padding-left: 0px;}
+.b_lblue{ background:#64bdd9;}
+.c_grey{ color:#888888;}
+.re_con{ margin:5px; width:665px;}
+.re_con_top{color:#494949; }
+.re_con_top span{ color:#999999; font-weight:bold;}
+ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
\ No newline at end of file

From be590497b9c11d60606d9fb1ca7044c542db5e31 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 11 Dec 2015 16:58:00 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E8=AE=BE=E4=B8=BA=E9=A6=96=E9=A1=B5=E5=90=8E=EF=BC=8C=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=87=B3=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/index.html.erb              | 2 +-
 app/views/organizations/set_homepage.js.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index d442b9112..dff20a20b 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -3,7 +3,7 @@
       <%= render :partial => 'project_file_new', locals: {project: @project} %>
   <% elsif @container_type == 1 %>
       <%= render :partial => 'course_file', locals: {course: @course} %>
-      <% elsif @container_type == 2 %>
+  <% elsif @container_type == 2 %>
       <%= render :partial => 'files/subfield_files', locals: {org_subfield: @org_subfield} %>
   <% end %>
 </div>
diff --git a/app/views/organizations/set_homepage.js.erb b/app/views/organizations/set_homepage.js.erb
index 5b56d57b3..97824bb3a 100644
--- a/app/views/organizations/set_homepage.js.erb
+++ b/app/views/organizations/set_homepage.js.erb
@@ -1,2 +1,2 @@
 //location.reload();
-window.location.href ='<%= organization_path(@org, :show_homepage => params[:show_homepage])%>';
\ No newline at end of file
+window.location.href ='<%= organization_path(@org, :show_homepage => 1)%>';
\ No newline at end of file

From c2d21b5a6bcffa8a3778cb050ed1914c2a2fe25a Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 11 Dec 2015 17:11:11 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_left_subfield_list.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index dbeaa6117..367c23843 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -29,7 +29,8 @@
         <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
         <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
       <% else %>
-        <%= link_to "#{field.name}", org_subfield_files_path(field, :organization_id => organization.id), :class => "homepageMenuText" %>
+        <%#= link_to "#{field.name}", org_subfield_files_path(field, :organization_id => organization.id), :class => "homepageMenuText" %>
+          <a href="javascript:void(0);" class="homepageMenuText"><%= field.name %></a>
       <% end %>
     </div>
     <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">

From df1d1a46850eeaabec87e4936d038620d10f864e Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Dec 2015 17:54:07 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B2=A1=E6=9C=89=E4=BF=9D=E5=AD=98=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/show.html.erb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index ad9195804..280d378f3 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -115,10 +115,7 @@
             $.ajax({
                 url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',
                 type:'post',
-                data:{
-                    'memo[content]':$("#memo_content").val(),
-                    'memo[subject]':$("#memo_subject").val()
-                },
+                data:$("#new_memo").serialize(),
                 success:function(data){
 
                 },

From 0ac4821f14443b2abde25b0a22cb58f31c5ff48a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Dec 2015 17:56:26 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb | 4 ++--
 app/services/users_service.rb    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index c53dcbed5..977a77569 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -85,7 +85,7 @@ class MyController < ApplicationController
       flash[:notice] = l(:notice_mail_notification_updated)
       redirect_to my_account_url
     else
-      redirect_to signin_url    
+      redirect_to signin_url
     end
   end
 
@@ -223,7 +223,7 @@ class MyController < ApplicationController
     end
     flash.now[:error] = l(:notice_account_old_wrong_password)
   end
-  render :template => 'my/account',:layout=>'base_users_new'
+  render :template => 'my/account',:layout=>'new_base_user'
   end
 
   # Create a new feeds key
diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 8b39c39ab..8df42fb41 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -228,7 +228,7 @@ class UsersService
     end
     course_list
   end
-  
+
   #修改密码
   def change_password params
     @current_user =  User.find(params[:current_user_id])

From 502310425b20fe95eb7d8c7dbb94c1b45ae487d1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 11 Dec 2015 19:13:34 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=8C=BF=E8=AF=84=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 2 +-
 app/models/student_work.rb                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 1fe798328..b79adda2d 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -923,7 +923,7 @@ class StudentWorkController < ApplicationController
   #成绩计算
   def set_final_score homework,student_work
     if homework && homework.homework_detail_manual
-      if homework.homework_type == 1 #匿评作业
+      if homework.homework_type != 2 #匿评作业
         if homework.teacher_priority == 1 #教师优先
           if student_work.teacher_score
             student_work.final_score = student_work.teacher_score
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index c6e2a6584..144f3859f 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -46,7 +46,7 @@ class StudentWork < ActiveRecord::Base
   #成绩计算
   def set_final_score homework,student_work
     if homework && homework.homework_detail_manual
-      if homework.homework_type == 1 #匿评作业
+      if homework.homework_type != 2 #匿评作业
         if homework.teacher_priority == 1 #教师优先
           if student_work.teacher_score
             student_work.final_score = student_work.teacher_score

From f028992a18a425e295368d4dad6b3ae5304b5a34 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 11 Dec 2015 19:34:17 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/memo.rb | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/models/memo.rb b/app/models/memo.rb
index 2ead1cbb6..ee9f4c8db 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -18,10 +18,28 @@ class Memo < ActiveRecord::Base
   #elasticsearch kaminari init
   Kaminari::Hooks.init
   Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
-  settings index: { number_of_shards: 5 } do
+  settings index: {
+      number_of_shards: 5 ,
+      analysis: {
+          char_filter: {
+              and_filter: {
+                type: "mapping",
+                mappings: [ "&=> and "]
+             }
+          },
+          analyzer: {
+              my_analyzer: {
+                  type: 'custom',
+                  tokenizer: 'standard',
+                  filter: ['classic'],
+                  char_filter: ['html_strip']
+              }
+          }
+      }
+  } do
     mappings dynamic: 'false' do
-      indexes :subject, analyzer: 'smartcn',index_options: 'offsets'
-      indexes :content, analyzer: 'smartcn',index_options: 'offsets'
+      indexes :subject, analyzer: 'smartcn',index_options: 'offsets'#, char_filter: 'html_strip'
+      indexes :content, analyzer:'my_analyzer',index_options: 'offsets',search_analyzer: 'smartcn'
       indexes :updated_at,index:"not_analyzed" ,type:'date'
     end
   end