diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index c4932b1b2..e83a13ad9 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -488,6 +488,23 @@ class FilesController < ApplicationController
        if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
          Mailer.run.attachments_added(attachments[:files])
        end
+       if !attachments.empty? && attachments[:files]
+         attachments[:files].each do |attachment|
+           if params[:publish_time]
+             if params[:publish_time] == ""
+               attachment.publish_time = Date.today
+             else
+               attachment.publish_time = params[:publish_time]
+             end
+           else
+             attachment.publish_time = Date.today
+           end
+           if attachment.publish_time > Date.today
+             attachment.is_publish = 0
+           end
+           attachment.save
+         end
+       end
        if params[:course_attachment_type] && params[:course_attachment_type].is_a?(Array)
          params[:course_attachment_type].each do |type|
            tag_name = get_tag_name_by_type_number  type
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 625a1de74..fb35d8495 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2144,22 +2144,22 @@ class UsersController < ApplicationController
     if(params[:type].blank? || params[:type] == "1") #全部
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
-                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_publish = 1 and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                            "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1)").order("created_on desc")
       else
         user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #Ta的资源库的话，应该是他上传的公开资源 加上 他加入的所有我可见课程里的公开资源
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 " +
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and is_publish = 1 " +
                                             "and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) " +
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1)").order("created_on desc")
       end
     elsif params[:type] == "2" #课程资源
       if User.current.id.to_i == params[:id].to_i
         user_course_ids = User.current.courses.map { |c| c.id}
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course' and is_publish = 1) or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1) ").order("created_on desc")
       else
         user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
-        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and container_type = 'Course')"+
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+        @attachments = Attachment.where("(author_id = #{params[:id]} and is_public = 1 and container_type = 'Course' and is_publish = 1)"+
+                                            "or (container_type = 'Course' and is_public = 1 and is_publish = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
       end
     elsif params[:type] == "3" #项目资源
       if User.current.id.to_i == params[:id].to_i
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 40ed4a21a..6d0066fbc 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -746,7 +746,7 @@ module CoursesHelper
     return[] unless course
     result = []
     course.attachments.each do |attachment|
-      if attachment.is_public? || User.current.member_of_course?(course) || User.current.admin?
+      if attachment.is_public? ||User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id))|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
         result << attachment
       end
     end
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index bd023f6d0..6b748649b 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -123,7 +123,8 @@ module FilesHelper
     attachments.each do |attachment|
       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.container_type == "Course" && User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id)))||
+          (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)) && attachment.is_publish == 1)||
           attachment.author_id == User.current.id ||
           attachment.container_type == "OrgSubfield"
         result << attachment
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 47c08d2fb..d7aade6c2 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -18,6 +18,9 @@
                             <span class="img_private ml5">私有</span>
                         <%end %>
                     </span>
+                    <% if file.is_publish == 0 %>
+                        <span class="grey_homework_btn_cir ml5"><%=file.publish_time %>&nbsp;&nbsp;0点发布</span>
+                    <% end %>
                   </div>
                   <div class="mt5">
                     <span class="fontGrey2 mr15 fl">上传时间：<%= format_time(file.created_on)%></span>
diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index 6cce4bf2e..2e53f05d2 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -21,10 +21,20 @@
           <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>
           </div>
           <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>-->
-          <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %>
+          <% if User.current.allowed_to?(:as_teacher,course) %>
+              <div class="mb5">
+                <label class="fl c_dark f14" style="margin-top: 4px;">延迟发布：</label>
+                <div class="calendar_div fl">
+                    <input  type="text" name="publish_time" id="attachment_publish_time" placeholder="发布日期(可选)" class="InputBox fl W120 calendar_input" readonly="readonly">
+                    <%#= calendar_for('attachment_publish_time')%>
+                </div>
+                <span class="fl c_red" style="margin-top: 4px;" id="publish_time_notice"></span>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+          <a href="javascript:void(0);" class=" fr courseSendCancel mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a id="submit_resource" href="javascript:void(0);" class="c_white courseSendSubmit fr" onclick="submit_course_resource();"><%= l(:button_confirm)%></a>
+          <%#= submit_tag '确定',:onclick=>'submit_course_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %>
       <% end %>
     </div>
 
@@ -35,8 +45,39 @@
 </div>
 
 <script>
-    function submit_resource()
+    function regex_publish_time()
     {
-        $('#submit_resource').parent().submit();
+        var myDate = new Date();
+        if($.trim($("#attachment_publish_time").val()) == "")
+        {
+            return true;
+        } else{
+            var publish_time = Date.parse($("#attachment_publish_time").val());
+            if(Date.parse(formate_date(myDate)) > publish_time)
+            {
+                $("#publish_time_notice").text("发布日期不能小于当前日期");
+                return false;
+
+            }
+            else
+            {
+                $("#publish_time_notice").text("");
+                return true;
+            }
+        }
     }
+    function submit_course_resource()
+    {
+        <% if User.current.allowed_to?(:as_teacher,course) %>
+            if(regex_publish_time()) {
+                $('#submit_resource').parent().submit();
+            }
+        <% else %>
+            $('#submit_resource').parent().submit();
+        <% end %>
+    }
+    $(function(){
+        var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: 0, showOn: 'button', buttonImageOnly: true, buttonImage: '/images/public_icon.png', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
+        $('#attachment_publish_time').datepicker(datepickerOptions);
+    });
 </script>
\ No newline at end of file
diff --git a/db/migrate/20160222064143_add_publish_to_attachments.rb b/db/migrate/20160222064143_add_publish_to_attachments.rb
new file mode 100644
index 000000000..5ca354396
--- /dev/null
+++ b/db/migrate/20160222064143_add_publish_to_attachments.rb
@@ -0,0 +1,21 @@
+class AddPublishToAttachments < ActiveRecord::Migration
+  def change
+    add_column :attachments, :is_publish, :integer, :default => 1
+    add_column :attachments, :publish_time, :date
+=begin
+    count = Attachment.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        Attachment.page(i).per(30).each do |atta|
+          begin
+            atta.publish_time = atta.created_on.strftime('%d-%b-%Y')
+            atta.save
+          ensure
+            logger.error("===================>>container_id is null")
+          end
+        end
+      end
+    end
+=end
+  end
+end