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

app/assets/javascripts/org_courses.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/org_courses.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the org_courses controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/courses_controller.rb

@@ -29,6 +29,30 @@ class CoursesController < ApplicationController
   before_filter :require_login, :only => [:join, :unjoin]
   #before_filter :allow_join, :only => [:join]
 
+  #查找组织
+  def search_public_orgs_not_in_course
+    condition = '%%'
+    if !params[:name].nil?
+      condition = "%#{params[:name].strip}%".gsub(" ","")
+    end
+    course_org_ids = OrgCourse.find_by_sql("select distinct organization_id from org_courses where course_id = #{params[:id]}").map(&:organization_id)
+    if course_org_ids.empty?
+      @orgs_not_in_course = Organization.where("(is_public or creator_id =?) and name like ?",User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
+    else
+      course_org_ids = "(" + course_org_ids.join(',') +  ")"
+      @orgs_not_in_course = Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page((params[:page].to_i || 1)).per(10)
+      @org_count =  Organization.where("id not in #{course_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
+    end
+    # @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count
+    @orgs_page = Paginator.new @org_count, 10,params[:page]
+    @hint_flag = params[:hint_flag]
+    #render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def join
     if User.current.logged?
         cs = CoursesService.new

app/controllers/files_controller.rb

@@ -24,7 +24,7 @@ class FilesController < ApplicationController
   before_filter :auth_login1, :only => [:index]
   before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
+  before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
 
   helper :sort
   include SortHelper

app/controllers/issues_controller.rb

@@ -20,11 +20,11 @@ class IssuesController < ApplicationController
   default_search_scope :issues
 
   before_filter :authorize1, :only => [:show]
-  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal]
+  before_filter :find_issue, :only => [:show, :edit, :update,:add_journal, :add_journal_in_org]
   before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
   before_filter :find_project, :only => [:new, :create, :update_form]
   #before_filter :authorize, :except => [:index, :show]
-  before_filter :authorize, :except => [:index,:add_journal]
+  before_filter :authorize, :except => [:index,:add_journal, :add_journal_in_org]
 
   before_filter :find_optional_project, :only => [:index]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
@@ -397,6 +397,23 @@ class IssuesController < ApplicationController
     end
   end
 
+  def add_journal_in_org
+    if User.current.logged?
+      jour = Journal.new
+      jour.user_id = User.current.id
+      jour.notes = params[:notes]
+      jour.journalized = @issue
+      jour.save
+      org_activity = OrgActivity.where("org_act_type='Issue' and org_act_id =#{@issue.id}").first
+      org_activity.updated_at = jour.created_on
+      org_activity.save
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
   private
 
   def find_project

app/controllers/messages_controller.rb

@@ -174,6 +174,11 @@ class MessagesController < ApplicationController
       user_activity.updated_at = Time.now
       user_activity.save
     end
+    org_activity = OrgActivity.where("org_act_type='Message' and org_act_id =#{@topic.id}").first
+    if org_activity
+      org_activity.updated_at = Time.now
+      org_activity.save
+    end
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]

app/controllers/org_courses_controller.rb

@@ -0,0 +1,18 @@
+class OrgCoursesController < ApplicationController
+  def create
+    org_ids = params[:orgNames]
+    @course = Course.find(params[:course_id])
+    org_ids.each do |org_id|
+      OrgCourse.create(:organization_id => org_id.to_i, :course_id => params[:course_id].to_i, :created_at => Time.now)
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def destroy
+    @course = Course.find(params[:course_id])
+    @org_course = OrgCourse.find(params[:id])
+    @org_course.destroy
+  end
+end

app/controllers/org_document_comments_controller.rb

@@ -12,7 +12,7 @@ class OrgDocumentCommentsController < ApplicationController
     @org_document_comment.title = params[:org_document_comment][:title]
     @org_document_comment.content = params[:org_document_comment][:content]
     if @org_document_comment.save
-      #flash[:notice] = 'success'
+      flash.keep[:notice] = l(:notice_successful_create)
       OrgActivity
       redirect_to organization_org_document_comments_path(@organization)
     else
@@ -20,15 +20,23 @@ class OrgDocumentCommentsController < ApplicationController
     end
   end
   def show
-
+    @document = OrgDocumentComment.find(params[:id])
   end
 
   def index
-    @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc")
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @documents = @organization.org_document_comments.where("parent_id is null").order("created_at desc")
+    else
+      render_403
+    end
   end
   def update
     @org_document =  OrgDocumentComment.find(params[:id])
     @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content])
+    if @org_document.parent.nil?
+      act  = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first
+      act.update_attributes(:updated_at => @org_document.updated_at)
+    end
     respond_to do |format|
       format.html {redirect_to organization_org_document_comments_path(:organization_id => @org_document.organization.id)}
     end
@@ -41,12 +49,24 @@ class OrgDocumentCommentsController < ApplicationController
 
   def add_reply
     @document = OrgDocumentComment.find(params[:id]).root
+    @act = OrgActivity.find(params[:id])
     @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
     @comment.content = params[:org_content]
     @document.children << @comment
     @document.save
   end
 
+  def add_reply_in_doc
+    @document = OrgDocumentComment.find(params[:id]).root
+    @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id])
+    @comment.content = params[:org_comment][:org_content]
+    @document.children << @comment
+    @document.save
+    respond_to do |format|
+      format.html {redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)}
+    end
+  end
+
   def find_organization
     @organization = Organization.find(params[:organization_id])
   end
@@ -59,5 +79,66 @@ class OrgDocumentCommentsController < ApplicationController
         org.home_id == nil
       end
     end
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def delete_reply
+    @org_document_comment = OrgDocumentComment.find(params[:id])
+    @document = @org_document_comment.root
+    org = @org_document_comment.organization
+    @org_document_comment.destroy
+    respond_to do |format|
+      format.html {redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)}
+    end
+  end
+  def quote
+    @org_comment = OrgDocumentComment.find(params[:id])
+    @subject = @org_comment.content
+    @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
+
+    @content = "> #{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)}\n> "
+    @temp = OrgDocumentComment.new
+    #@course_id = params[:course_id]
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, User.find(@org_comment.creator_id).realname)} <br/>#{@org_comment.content.html_safe}</blockquote>".html_safe
+    respond_to do | format|
+      format.js
+    end
+  end
+
+  def reply
+    @document = OrgDocumentComment.find(params[:id]).root
+    @quote = params[:quote][:quote]
+    @org_document = OrgDocumentComment.new(:creator_id => User.current.id, :reply_id => params[:id])
+
+    # params[:blog_comment][:sticky] = params[:blog_comment][:sticky] || 0
+    # params[:blog_comment][:locked] =  params[:blog_comment][:locked] || 0
+    @org_document.title = params[:org_document_comment][:title]
+    @org_document.content = params[:org_document_comment][:content]
+    @org_document.content = @quote + @org_document.content
+    #@org_document.title = "RE: #{@article.title}" unless params[:blog_comment][:title]
+    @document.children << @org_document
+    # @user_activity_id = params[:user_activity_id]
+    # user_activity = UserActivity.where("act_type='BlogComment' and act_id =#{@article.id}").first
+    # if user_activity
+    #   user_activity.updated_at = Time.now
+    #   user_activity.save
+    # end
+    # attachments = Attachment.attach_files(@org_document, params[:attachments])
+    # render_attachment_warning_if_needed(@org_document)
+    #@article.save
+    # redirect_to user_blogs_path(:user_id=>params[:user_id])
+    respond_to do |format|
+      format.html {
+        # if params[:course_id] #如果呆了course_id过来了，那么这是要跳到课程大纲去的
+        #   redirect_to syllabus_course_path(:id=>params[:course_id])
+        # else
+        redirect_to org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id)
+        # end
+
+      }
+      format.js
+    end
   end
 end

app/controllers/org_projects_controller.rb

@@ -4,7 +4,6 @@ class OrgProjectsController < ApplicationController
     @project = Project.find(params[:project_id])
     org_ids.each do |org_id|
       OrgProject.create(:organization_id => org_id.to_i, :project_id => params[:project_id].to_i, :created_at => Time.now)
-      p 1
     end
     respond_to do |format|
       format.js
@@ -14,18 +13,5 @@ class OrgProjectsController < ApplicationController
     @project = Project.find(params[:project_id])
     @org_project = OrgProject.find(params[:id])
     @org_project.destroy
-
-    condition = '%%'
-    project_org_ids = OrgProject.find_by_sql("select distinct organization_id from org_projects where project_id = #{params[:project_id]}").map(&:organization_id)
-    if project_org_ids.empty?
-      @orgs_not_in_project = Organization.where("(is_public or creator_id =?) = 1 and name like ?",User.current.id, condition).page( 1).per(10)
-      @org_count = Organization.where("is_public = 1 or creator_id =?", User.current.id).where("name like ?", condition).count
-    else
-      project_org_ids = "(" + project_org_ids.join(',') +  ")"
-      @orgs_not_in_project = Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?) and name like ?", User.current.id, condition).page( 1).per(10)
-      @org_count =  Organization.where("id not in #{project_org_ids} and (is_public = 1 or creator_id =?)", User.current.id).where("name like ?", condition).count
-    end
-    # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
-    @orgs_page = Paginator.new @org_count, 10,1
   end
 end

app/controllers/organizations_controller.rb

@@ -56,13 +56,29 @@ class OrganizationsController < ApplicationController
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
       project_ids = @organization.projects.map(&:id) << 0
-      @org_activities  = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))",
-                                       @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
-      @org_activities_count  = OrgActivity.where("(container_id =? and container_type =?) or (container_type ='Project' and container_id in (#{project_ids.join(',')}))" ,
-                                           @organization.id, 'Organization ').count
-      # @org_project_activties = ForgeActivity.where("project_id in (#{project_ids.join(',')}) and forge_act_type in('Issue','Message','ProjectCreateInfo')").order("updated_at desc").page(params[:page]  || 1).per(10)
-      # @org_project_activties_count =  ForgeActivity.where('project_id in (?)',project_ids.join(',')).count
-      #@org_activities = paginateHelper @org_activities, 10
+      course_ids = @organization.courses.map(&:id) << 0
+      course_types = "('Message','News','HomeworkCommon','Poll','Course')"
+      case params[:type]
+        when nil
+          @org_activities  = OrgActivity.where("(container_id =? and container_type =?) " +
+                                             "or (container_type ='Project' and org_act_type in ('Issue','Message','ProjectCreateInfo') and container_id in (#{project_ids.join(',')})) "+
+                                             "or (container_type ='Course' and org_act_type in #{course_types} and container_id in (#{course_ids.join(',')}))",
+                                             @organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'project_issue'
+          @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Issue' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'project_message'
+          @org_activities = OrgActivity.where("container_type = 'Project' and org_act_type = 'Message' and container_id in (#{project_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'org'
+          @org_activities = OrgActivity.where("container_id =? and container_type =?",@organization.id, 'Organization').order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_homework'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'HomeworkCommon' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_news'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'News' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_message'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Message' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+        when 'course_poll'
+          @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
+      end
       @page = params[:page]
       respond_to do |format|
         format.html
@@ -135,13 +151,26 @@ class OrganizationsController < ApplicationController
   end
 
   def members
-    @members = OrgMember.where("organization_id =?", @organization.id)
+    if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
+      @members = OrgMember.where("organization_id =?", @organization.id)
+    else
+      render_403
+    end
   end
 
   def  more_org_projects
     @organization = Organization.find params[:id]
     @page = params[:page]
-    @org_projects = @organization.org_projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5)
+    @org_projects = @organization.projects.reorder('created_at').page((params[:page].to_i || 1) +1).per(5)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def more_org_courses
+    @organization = Organization.find(params[:id])
+    @page = params[:page]
+    @org_courses = @organization.courses.reorder('created_at').page((params[:page].to_i || 1) + 1 ).per(5)
     respond_to do |format|
       format.js
     end

app/controllers/projects_controller.rb

@@ -86,6 +86,7 @@ class ProjectsController < ApplicationController
     end
    # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
     @orgs_page = Paginator.new @org_count, 10,params[:page]
+    @no_roll_hint = params[:hint_flag]
     #render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json
     respond_to do |format|
       format.js

app/helpers/org_courses_helper.rb

@@ -0,0 +1,2 @@
+module OrgCoursesHelper
+end

app/models/course.rb

@@ -18,6 +18,8 @@ class Course < ActiveRecord::Base
            :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"
   has_many :principals, :through => :member_principals, :source => :principal
   has_many :users, :through => :members
+  has_many :org_courses
+  has_many :organizations, :through => :org_courses
   # has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
   # has_many :homework_for_courses, :dependent => :destroy

app/models/course_activity.rb

@@ -5,8 +5,8 @@ class CourseActivity < ActiveRecord::Base
   belongs_to :course
   belongs_to :user
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
-  after_save :add_user_activity
-  before_destroy :destroy_user_activity
+  after_save :add_user_activity, :add_course_activity
+  before_destroy :destroy_user_activity, :destroy_org_activity
 
   #在个人动态里面增加当前动态
   def add_user_activity
@@ -30,8 +30,34 @@ class CourseActivity < ActiveRecord::Base
     end
   end
 
+  def add_course_activity
+    org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'").first
+    if org_activity
+      org_activity.save
+    else
+      if self.course_act_type == 'Message' && !self.course_act.parent_id.nil?
+        org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.course_act.parent.id}").first
+        org_activity.created_at = self.created_at
+        org_activity.save
+      else
+        OrgActivity.create(:user_id => self.user_id,
+                       :org_act_id => self.course_act_id,
+                       :org_act_type => self.course_act_type,
+                       :container_id => self.course_id,
+                       :container_type => 'Course',
+                       :created_at => self.created_at,
+                       :updated_at => self.updated_at)
+        end
+      end
+  end
+
   def destroy_user_activity
     user_activity = UserActivity.where("act_type = '#{self.course_act_type.to_s}' and act_id = '#{self.course_act_id}'")
     user_activity.destroy_all
   end
+
+  def destroy_org_activity
+    org_activity = OrgActivity.where("org_act_type = '#{self.course_act_type.to_s}' and org_act_id = '#{self.course_act_id}'")
+    org_activity.destroy_all
+  end
 end

app/models/forge_activity.rb

@@ -21,7 +21,7 @@ class ForgeActivity < ActiveRecord::Base
   validates :forge_act_type, presence: true
   has_many :user_acts, :class_name => 'UserAcivity',:as =>:act
   after_save :add_user_activity, :add_org_activity
-  before_destroy :destroy_user_activity
+  before_destroy :destroy_user_activity, :destroy_org_activity
 
   #在个人动态里面增加当前动态
   def add_user_activity
@@ -46,17 +46,28 @@ class ForgeActivity < ActiveRecord::Base
   end
 
   def add_org_activity
-    OrgActivity.create(:user_id => self.user_id,
+    if self.forge_act_type == 'Message' && !self.forge_act.parent_id.nil?
+      org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{self.forge_act.parent.id}").first
+      org_activity.created_at = self.created_at
+      org_activity.save
+    else
+      OrgActivity.create(:user_id => self.user_id,
                        :org_act_id => self.forge_act_id,
                        :org_act_type => self.forge_act_type,
                        :container_id => self.project_id,
                        :container_type => 'Project',
                        :created_at => self.created_at,
                        :updated_at => self.updated_at)
+    end
   end
 
   def destroy_user_activity
     user_activity = UserActivity.where("act_type = '#{self.forge_act_type.to_s}' and act_id = '#{self.forge_act_id}'")
     user_activity.destroy_all
   end
+
+  def destroy_org_activity
+    org_acts = OrgActivity.where("org_act_type='#{self.forge_act_type.to_s}' and org_act_id = '#{self.forge_act_id}'")
+    org_acts.destroy_all
+  end
 end

app/models/org_course.rb

@@ -0,0 +1,5 @@
+class OrgCourse < ActiveRecord::Base
+  #attr_accessible :organization, :course, :created_at
+  belongs_to :organization
+  belongs_to :course
+end

app/models/org_document_comment.rb

@@ -11,6 +11,10 @@ class OrgDocumentComment < ActiveRecord::Base
   def document_save_as_org_activity
     if(self.parent().nil?)
       self.org_acts << OrgActivity.new(:user_id => User.current.id, :container_id => self.organization.id, :container_type => 'Organization')
+    else
+      act = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", self.root.id).first
+      act.update_attributes(:updated_at => self.updated_at)
     end
   end
+
 end

app/models/organization.rb

@@ -3,7 +3,9 @@ class Organization < ActiveRecord::Base
   has_many :org_members, :dependent => :destroy
   has_many :org_projects ,:dependent => :destroy
   has_many :projects,:through => :org_projects
+  has_many :courses, :through => :org_courses
   has_many :org_document_comments, :dependent => :destroy
+  has_many :org_courses
   has_many :users, :through => :org_members
   validates_uniqueness_of :name
   after_create :save_as_org_activity

app/services/courses_service.rb

@@ -186,6 +186,7 @@ class CoursesService
   #params[:setup_time]：暂不传（貌似已经没用了）
   #params[:endup_time]: 暂不传（貌似已经没用了）
   #params[:class_period]:学时总数
+  #params[:course][:publish_resource]允许学生上传资源
   def create_course(params,current_user)
     if current_user.user_extensions.identity
       @course = Course.new
@@ -202,6 +203,7 @@ class CoursesService
       @course.class_period = params[:class_period].to_i
       params[:course][:is_public] ? @course.is_public = 1 : @course.is_public = 0
       params[:course][:open_student] ? @course.open_student = 1 : @course.open_student = 0
+      params[:course][:publish_resource] ? @course.publish_resource = 1 : @course.publish_resource = 0
     else
 
     end
@@ -243,6 +245,7 @@ class CoursesService
   #params[:term]：学期（秋季学期或春季学期）
   #params[:time]: 年份（例：2014）
   #params[:class_period]:学时总数
+  #params[:publish_resource] 允许学生上传资源 0 不允许 1 允许
   def edit_course(params,course,current_user)
     course.send(:safe_attributes=, params[:course], current_user)
     #course.safe_attributes = params[:course]
@@ -251,6 +254,7 @@ class CoursesService
     course.class_period = params[:class_period].to_i
     params[:course][:is_public] ? course.is_public = 1 : course.is_public = 0
     params[:course][:open_student] ? course.open_student = 1 : course.open_student = 0
+    params[:course][:publish_resource] ? course.publish_resource = 1 : course.publish_resource = 0
     if course.save
       if params[:course][:is_public] == '0'
         course_status = CourseStatus.find_by_course_id(course.id)

app/views/courses/new.html.erb

@@ -50,6 +50,12 @@
         <span class="c_grey">（打钩为"学生列表公开"，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）</span>
         <div class="cl"></div>
       </li>
+       <li class=" mb5 ml30">
+          <label >学生上传资源&nbsp;&nbsp;：</label>
+          <input <%= @course.publish_resource == 1 ? 'checked' : ''%> id="course_publish_resource" name="course[publish_resource]"  type="checkbox" />
+          <span class="c_grey">（打钩为"允许学生上传资源"，不打钩为"不允许学生上传资源"）</span>
+          <div class="cl"></div>
+       </li>
       <li class=" ml90" >
         <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_course();" >提交</a>
         <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>

app/views/courses/search_public_orgs_not_in_course.js.erb

@@ -0,0 +1,19 @@
+<% if @hint_flag.nil? %>
+    if($("#join_orgs_for_course input:checked").size() > 0)
+    {
+        alert("翻页或搜索后将丢失当前选择的用户数据");
+    }
+<% end %>
+$("#search_orgs_result_list").html("");
+$("#search_orgs_result_list").append('<ul class="ml20">');
+<% @orgs_not_in_course.each do |org|%>
+    link = "<li><label><input type='checkbox'class='mr5 fl mt3' name='orgNames[]' value='<%=org.id%>'/><span class='relateOrgName fl'> <%=org.name %> </span></label></li><div class='cl mt5'></div>";
+    $("#search_orgs_result_list").append(link );
+<%end %>
+$("#search_orgs_result_list").append('</ul>')
+<% if @org_count > 10 %>
+    $("#paginator").html(' <%=  pagination_links_full @orgs_page, @org_count ,:per_page_links => true,:remote =>true,:flag=>true%>');
+    $("#paginator").css("display", "block");
+<% else %>
+    $("#paginator").css("display", "none");
+<% end %>

app/views/courses/settings.html.erb

@@ -10,6 +10,9 @@
       <li id="tb_2" class="hwork_normaltab" onclick="course_setting(2);">
         成员
       </li>
+      <li id="tb_3" class="hwork_normaltab" onclick="course_setting(3);">
+        组织
+      </li>
     </ul>
   </div>
   <div class="hwork_dis" id="tbc_01" style="padding-top: 10px;">
@@ -65,6 +68,12 @@
             <span class="c_grey">（打钩为"学生列表公开"，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）</span>
             <div class="cl"></div>
           </li>
+          <li class=" mb5 ml30">
+            <label >学生上传资源&nbsp;&nbsp;：</label>
+            <input <%= @course.publish_resource == 1 ? 'checked' : ''%> id="course_publish_resource" name="course[publish_resource]"  type="checkbox" style="margin-left: 1px;"/>
+            <span class="c_grey">（打钩为"允许学生上传资源"，不打钩为"不允许学生上传资源"）</span>
+            <div class="cl"></div>
+          </li>
           <li class=" ml90" >
             <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_edit_course(<%= @course.id%>);" >提交</a>
             <%= link_to l(:button_cancel), course_path(@course), :class => "blue_btn grey_btn fl c_white" %>
@@ -91,6 +100,10 @@
       <%= render :partial => "course_members" %>
     </div>
   </div><!---成员结束-->
+
+  <div class="hwork_undis" id="tbc_03">
+    <%= render :partial => 'courses/settings/join_org' %>
+  </div>
 </div><!--talknew end-->
 <div class="cl"></div>
 <script type="text/javascript">
@@ -105,4 +118,4 @@
   }
   $("#time_selected").click(select);
   $("#term_selected").click(select);
-</script>
+</script>

app/views/courses/settings/_added_orgs.html.erb

@@ -0,0 +1,12 @@
+<ul>
+  <li><span class="relatedListName fb fl">名称</span><span class="relatedListOption fb fl">操作</span></li>
+  <% orgs.each do |org| %>
+      <li>
+        <a href="<%= organization_path(org) %>" class="relatedListName linkBlue fl"><%= org.name %></a>
+        <a href="javascript:void(0);" onclick="cancel_org_course_relation(<%= OrgCourse.where(:organization_id => org.id, :course_id => course_id).first.id %>, '<%= course_id %>');"
+           class = "relatedListOption fl linkGrey3">取消关联</a>
+        <%#= link_to "取消关联", org_course_path(:id => OrgCourse.where(:organization_id => org.id, :course_id => course_id).first.id, :course_id => course_id),
+                    :method => 'delete',:remote => true, :class => "relatedListOption fl linkGrey3" %>
+      </li>
+  <% end %>
+</ul>

app/views/courses/settings/_join_org.html.erb

@@ -0,0 +1,86 @@
+<!--<div class="members_left">-->
+<!--<input type="text" id="orgs_not_course_member_search" name="orgAddSearch" placeholder="支持姓名、邮箱、昵称搜索" class="orgAddSearch mb20" />-->
+<!--<%#= javascript_tag "observeSearchfield('orgs_not_course_member_search', null, '#{ escape_javascript autocomplete_search_organizations_path(:course_id=> @course.id, :format => 'js') }')" %>-->
+<!--<div id="new_orgs_for_course">-->
+
+<!--</div>-->
+<!--</div>-->
+<%= stylesheet_link_tag 'org' %>
+
+<div>
+  <div class="relateOrg fl">
+    <span class="pic_add fl mr5 mt3"></span><span class="f14 fontBlue fl">关联组织</span>
+    <div class="cl mb5"></div>
+    <%= form_tag url_for(:controller => 'org_courses', :action => 'create', :course_id => @course.id), :id => 'join_orgs_for_course', :remote => true do %>
+        <input type="text" name="orgs" class="searchOrg mb5 ml20" placeholder="请输入组织名称" />
+        <div id="search_orgs_result_list" class="ml20"></div>
+        <ul id="paginator" class="wlist ml20" style="float:none;"></ul>
+        <a href="javascript:void(0);" class="saveBtn db fl ml20 mr15 mb5" onclick="course_join_org(<%= @course.id %>);">关联</a>
+        <a href="javascript:void(0);" class="cancelBtn db fl" onclick="cancel_join_orgs();">取消</a>
+    <% end %>
+  </div>
+  <div class="relatedList fr">
+    <div class="fr mr15">
+      <span class="f14 fontBlue">已关联组织</span>
+      <div id="added_orgs">
+        <%= render :partial => 'courses/settings/added_orgs', :locals => {:orgs => @course.organizations, :course_id => params[:id]} %>
+      </div>
+      <div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+    var lastSearchCondition = '';
+    var page = 1;
+    var count = 0;
+    var maxPage = 0;
+    function search_orgs(e){
+        if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
+        {
+            return;
+        }
+        lastSearchCondition = $(e.target).val().trim();
+        page = 1;
+        $.ajax({
+            url: '<%= url_for(:controller => 'courses', :action => 'search_public_orgs_not_in_course') %>'+'?name='+ e.target.value+'&page='+page,
+            type:'get'
+        });
+    }
+
+    function throttle(method,context,e){
+        clearTimeout(method.tId);
+        method.tId=setTimeout(function(){
+            method.call(context,e);
+        },500);
+    }
+
+    //查询组织
+    $("input[name='orgs']").on('input', function (e) {
+        throttle(search_orgs,window,e);
+    });
+
+    $(document).ready(function(){
+        $.ajax({
+            url: '<%= url_for(:controller => 'courses', :action => 'search_public_orgs_not_in_course') %>'+'?page=1',
+            type:'get'
+        });
+    });
+    function cancel_join_orgs() {
+        $("#search_orgs_result_list").html("");
+        $("#paginator").css("display", "none")
+    }
+    function course_join_org(courseId) {
+        $.ajax({
+            url: "/org_courses?" + $("#join_orgs_for_course").serialize() + "&course_id=" + courseId,
+            type: "post",
+            success: function (data) {
+                $.ajax({
+                    url: "/courses/" + courseId + "/search_public_orgs_not_in_course?hint_flag=true&name=" + $("input[name='orgs']").val().trim(),
+                    type: "get"
+                });
+            }
+        });
+    }
+</script>

app/views/files/_course_file.html.erb

@@ -72,7 +72,7 @@
           <%= 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) %>  <!-- show_window('light','fade','20%','35%')-->
+      <% 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">
             上传：