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

Conflicts:
	.gitignore
	Gemfile
	app/controllers/discuss_demos_controller.rb
	app/models/user.rb
	app/views/bids/_bid_homework_show.html.erb
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/poll/publish_poll.js.erb
	app/views/poll/republish_poll.js.erb
	public/javascripts/application.js

Signed-off-by: alanlong9278 <547533434@qq.com>

.gitignore

@@ -23,3 +23,6 @@
 public/api_doc/
 /.metadata
 vendor/cache
+/files
+/public/images/avatars
+/public/files

Gemfile

@@ -4,10 +4,11 @@ source 'http://ruby.taobao.org'
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
-  gem 'rubyzip'
-  gem 'zip-zip'
 end
 
+gem 'rubyzip'
+gem 'delayed_job_active_record'#, :group => :production
+gem 'daemons'
 gem 'grape', '~> 0.9.0'
 gem 'grape-entity'
 gem 'seems_rateable', '~> 1.0.13'
@@ -23,7 +24,7 @@ gem 'ruby-ole'
 #gem 'email_verifier', path: 'lib/email_verifier'
 gem 'rufus-scheduler'
 #gem 'dalli', path: 'lib/dalli-2.7.2'
-gem 'rails_kindeditor'
+gem 'rails_kindeditor',path:'lib/rails_kindeditor'
 group :development do
   gem 'grape-swagger'
   #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
@@ -32,7 +33,7 @@ group :development do
   if RUBY_VERSION >= '2.0.0'
     gem 'pry-byebug'
   else
-    gem 'pry-debugger'
+    # gem 'pry-debugger'
   end
   gem 'pry-stack_explorer'
   gem 'better_errors', '~> 1.1.0'
@@ -58,8 +59,6 @@ group :test do
   #end
 end
 
- # gem 'rspec-rails' , '2.13.1'
- # gem 'guard-rspec','2.5.0'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do

app/api/mobile/api.rb

@@ -41,7 +41,7 @@ module Mobile
     mount Apis::Comments
 
     #add_swagger_documentation ({api_version: 'v1', base_path: 'http://u06.shellinfo.cn/trustie/api'})
-     #add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
+    #add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 
   end
 end

app/api/mobile/apis/auth.rb

@@ -26,7 +26,7 @@ module Mobile
             present :data, {token: key.access_token, user: api_user}, using: Entities::Auth
             present :status, 0
           else
-            raise 'Unauthorized.'
+            raise "无效的用户名或密码"
           end
         end
 

app/api/mobile/apis/comments.rb

@@ -80,7 +80,7 @@ module Mobile
         end
         post do
           cs_params = {
-              memo: {:subject => params[:subject],:content => '该贴来自手机App意见反馈'},
+              memo: {:subject => '该贴来自手机App意见反馈' ,:content => params[:subject]},
           }
           cs = CommentService.new
           memo,message = cs.create_feedback cs_params, current_user

app/api/mobile/apis/courses.rb

@@ -80,6 +80,10 @@ module Mobile
             class_period: params[:class_period]
           }
           course = ::Course.find(params[:course_id])
+          # 如果没有传密码过来，那就把原来的密码给上，不然会不更新
+          if params[:password].nil? || params[:password].blank?
+            cs_params[:course][:password] = course[:password]
+          end
           cs.edit_course_authorize(current_user,course)
           course = cs.edit_course(cs_params, course,current_user)
           present :data, course, with: Mobile::Entities::Course

app/api/mobile/apis/users.rb

@@ -14,7 +14,7 @@ module Mobile
           us = UsersService.new
           user = us.register params.merge(:password_confirmation => params[:password],
                                           :should_confirmation_password => true)
-          raise "register failed #{user.errors.full_messages}" if user.new_record?
+          raise "该邮箱已经被注册过了" if user.new_record?
           
           present :data, user, with: Mobile::Entities::User
           present :status, 0

app/api/mobile/entities/course.rb

@@ -58,6 +58,7 @@ module Mobile
       end
       course_expose :current_user_is_member
       course_expose :current_user_is_teacher
+      course_expose :work_unit
     end
   end
 end

app/api/mobile/entities/user.rb

@@ -15,13 +15,13 @@ module Mobile
                 when :img_url
                   url_to_avatar(u)
                 when :gender
-                  u.user_extensions.gender.nil? ? 0 : u.user_extensions.gender
+                  u.nil? || u.user_extensions.nil? || u.user_extensions.gender.nil? ? 0 : u.user_extensions.gender
                 when :work_unit
                   get_user_work_unit u
                 when :location
                   get_user_location u
                 when :brief_introduction
-                  u.user_extensions.brief_introduction
+                  u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.brief_introduction
               end
             end
           end

app/controllers/account_controller.rb

@@ -88,9 +88,7 @@ class AccountController < ApplicationController
         # create a new token for password recovery
         token = Token.new(:user => user, :action => "recovery")
         if token.save
-          Thread.new do
-            Mailer.lost_password(token).deliver
-          end
+            Mailer.run.lost_password(token)
             flash[:notice] = l(:notice_account_lost_email_sent)
             redirect_to signin_url
           return                      
@@ -228,7 +226,7 @@ class AccountController < ApplicationController
     user = User.find(params[:user]) if params[:user]
     token = Token.new(:user => user, :action => "register")
     if token.save
-      Mailer.register(token).deliver
+      Mailer.run.register(token)
 
     else
       yield if block_given?
@@ -366,7 +364,7 @@ class AccountController < ApplicationController
     token = Token.new(:user => user, :action => "register")
     if user.save and token.save
       UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
-      Mailer.register(token).deliver
+      Mailer.run.register(token)
 
 
       flash[:notice] = l(:notice_account_register_done)
@@ -401,7 +399,7 @@ class AccountController < ApplicationController
     if user.save
       UserStatus.create(:user_id => user.id ,:changsets_count => 0, :watchers_count => 0)
       # Sends an email to the administrators
-      Mailer.account_activation_request(user).deliver
+      Mailer.run.account_activation_request(user)
       account_pending
     else
       yield if block_given?

app/controllers/applied_project_controller.rb

@@ -13,7 +13,7 @@ class AppliedProjectController < ApplicationController
           @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
           if  @applieds.count == 0
             appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
-            Mailer.applied_project(appliedproject).deliver
+            Mailer.run.applied_project(appliedproject)
             @status = 2
           else
             @status = 1
@@ -31,7 +31,7 @@ class AppliedProjectController < ApplicationController
     @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
     if  @applieds.count == 0
       appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
-      Mailer.applied_project(appliedproject).deliver
+      Mailer.run.applied_project(appliedproject)
     end
 
     #redirect_to project_path(params[:project_id])

app/controllers/attachments_controller.rb

@@ -27,7 +27,7 @@ class AttachmentsController < ApplicationController
   accept_api_auth :show, :download, :upload
   require 'iconv'
   include AttachmentsHelper
-
+  include ApplicationHelper
 
   def show
     respond_to do |format|
@@ -65,36 +65,7 @@ class AttachmentsController < ApplicationController
   def download
     # modify by nwb
     # 下载添加权限设置
-     candown = false
-    if @attachment.container.class.to_s != "HomeworkAttach" && (@attachment.container.has_attribute?(:project) || @attachment.container.has_attribute?(:project_id)) && @attachment.container.project
-      project = @attachment.container.project
-      candown= User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
-    elsif  @attachment.container.is_a?(Project)
-      project = @attachment.container
-      candown= User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
-    elsif (@attachment.container.has_attribute?(:board) || @attachment.container.has_attribute?(:board_id)) && @attachment.container.board &&
-        @attachment.container.board.project
-      project = @attachment.container.board.project
-      candown = User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
-    elsif (@attachment.container.has_attribute?(:course) ||@attachment.container.has_attribute?(:course_id) ) && @attachment.container.course
-      course = @attachment.container.course
-      candown = User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
-    elsif @attachment.container.is_a?(Course)
-      course = @attachment.container
-      candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
-    elsif (@attachment.container.has_attribute?(:board) || @attachment.container.has_attribute?(:board_id)) && @attachment.container.board &&
-        @attachment.container.board.course
-      course = @attachment.container.board.course
-      candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
-    elsif @attachment.container.class.to_s=="HomeworkAttach" && @attachment.container.bid.reward_type == 3
-      candown = true
-    elsif  @attachment.container_type == "Bid" && @attachment.container && @attachment.container.courses.first
-      course = @attachment.container.courses.first
-      candown = User.current.member_of_course?(course) || (course.is_public == 1 && @attachment.is_public == 1)
-    else
-
-      candown = @attachment.is_public == 1
-    end
+     candown = attachment_candown @attachment
     if candown || User.current.admin? || User.current.id == @attachment.author_id
       @attachment.increment_download
       if stale?(:etag => @attachment.digest)
@@ -108,7 +79,7 @@ class AttachmentsController < ApplicationController
     end
 
   rescue => e
-    redirect_to "http://" + (Setting.host_name.to_s) +"/file_not_found.html"
+    redirect_to "http:  //" + (Setting.host_name.to_s) +"/file_not_found.html"
   end
 
   #更新资源文件类型
@@ -349,6 +320,46 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  def add_exist_file_to_projects
+    file = Attachment.find(params[:file_id])
+    projects = params[:projects][:project]
+    @message = ""
+    projects.each do |project|
+      c = Project.find(project);
+      if project_contains_attachment?(c,file)
+        if @message && @message == ""
+          @message += l(:label_project_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed)
+          next
+        else
+          @message +=  "<br/>" + l(:label_project_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed)
+          next
+        end
+      end
+      attach_copied_obj = file.copy
+      attach_copied_obj.tag_list.add(file.tag_list) # tag关联
+      attach_copied_obj.container = c
+      attach_copied_obj.created_on = Time.now
+      attach_copied_obj.author_id = User.current.id
+      attach_copied_obj.copy_from = file.copy_from.nil? ? file.id : file.copy_from
+      if attach_copied_obj.attachtype == nil
+        attach_copied_obj.attachtype = 4
+      end
+      @obj = c
+      @save_flag = attach_copied_obj.save
+      @save_message = attach_copied_obj.errors.full_messages
+      update_quotes attach_copied_obj
+    end
+    respond_to do |format|
+      format.js
+    end
+  rescue NoMethodError
+    @save_flag = false
+    @save_message = [] << l(:label_course_empty_select)
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def add_exist_file_to_courses
     file = Attachment.find(params[:file_id])
     courses = params[:courses][:course]

app/controllers/boards_controller.rb

@@ -66,15 +66,28 @@ class BoardsController < ApplicationController
                     'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)"
 
         @topic_count = @board.topics.count
-        @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
-        @topics =  @board.topics.
-          reorder("#{Message.table_name}.sticky DESC").
-          includes(:last_reply).
-          limit(@topic_pages.per_page).
-          offset(@topic_pages.offset).
-          order(sort_clause).
-          preload(:author, {:last_reply => :author}).
-          all
+        if @project
+          @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+          @topics =  @board.topics.
+              reorder("#{Message.table_name}.sticky DESC").
+              includes(:last_reply).
+              limit(@topic_pages.per_page).
+              offset(@topic_pages.offset).
+              order(sort_clause).
+              preload(:author, {:last_reply => :author}).
+              all
+        elsif @course
+          board_topics =  @board.topics.
+              reorder("#{Message.table_name}.sticky DESC").
+              includes(:last_reply).
+              # limit(@topic_pages.per_page).
+              # offset(@topic_pages.offset).
+              order(sort_clause).
+              preload(:author, {:last_reply => :author}).
+              all
+          @topics = paginateHelper board_topics,10
+        end
+
         @message = Message.new(:board => @board)
         #modify by nwb
         if @project

app/controllers/comments_controller.rb

@@ -17,6 +17,7 @@
 
 class CommentsController < ApplicationController
   default_search_scope :news
+  include ApplicationHelper
   model_object News
   before_filter :find_model_object 
   before_filter :find_project_from_association
@@ -26,9 +27,13 @@ class CommentsController < ApplicationController
     raise Unauthorized unless @news.commentable?
 
     @comment = Comment.new
-    @comment.safe_attributes = params[:comment]
+    @project ? @comment.comments = params[:comment][:comments] : @comment.comments = params[:comment]
     @comment.author = User.current
     if @news.comments << @comment
+      if params[:asset_id]
+        ids = params[:asset_id].split(',')
+        update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT
+      end
       flash[:notice] = l(:label_comment_added)
     end
 

app/controllers/documents_controller.rb

@@ -110,7 +110,7 @@ class DocumentsController < ApplicationController
     render_attachment_warning_if_needed(@document)
 
     if attachments.present? && attachments[:files].present? && Setting.notified_events.include?('document_added')
-      Mailer.attachments_added(attachments[:files]).deliver
+      Mailer.run.attachments_added(attachments[:files])
     end
     redirect_to document_url(@document)
   end

app/controllers/files_controller.rb

@@ -23,13 +23,14 @@ 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]
+  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:search_project,:quote_resource_show_project]
 
   helper :sort
   include SortHelper
   include FilesHelper
   helper :project_score
   include CoursesHelper
+  include ApplicationHelper
 
   def show_attachments obj
     @attachments = []
@@ -41,8 +42,8 @@ class FilesController < ApplicationController
     @feedback_count = @all_attachments.count
     @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
     @offset ||= @feedback_pages.offset
-    @curse_attachments_all = @all_attachments[@offset, @limit]
-    @curse_attachments = paginateHelper @all_attachments,10
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @obj_attachments = paginateHelper @all_attachments,10
   end
 
   def search
@@ -78,6 +79,39 @@ class FilesController < ApplicationController
     end
   end
 
+  def search_project
+    sort = ""
+    @sort = ""
+    @order = ""
+    @is_remote = true
+    if params[:sort]
+      order_by = params[:sort].split(":")
+      @sort = order_by[0]
+      if order_by.count > 1
+        @order = order_by[1]
+      end
+      sort = "#{@sort} #{@order}"
+    end
+
+    begin
+      q = "%#{params[:name].strip}%"
+      #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
+      if params[:insite]
+        @result = find_public_attache q,sort
+        @result = visable_attachemnts_insite @result,@project
+        @searched_attach = paginateHelper @result,10
+      else
+        @result = find_project_attache q,@project,sort
+        @result = visable_attachemnts @result
+        @searched_attach = paginateHelper @result,10
+      end
+
+      #rescue Exception => e
+      #  #render 'stores'
+      #  redirect_to search_course_files_url
+    end
+  end
+
   def find_course_attache keywords,course,sort = ""
     if sort == ""
       sort =  "created_on DESC"
@@ -87,6 +121,26 @@ class FilesController < ApplicationController
     #resultSet = Attachment.find_by_sql("SELECT `attachments`.* FROM `attachments` LEFT OUTER JOIN `homework_attaches` ON `attachments`.container_type = 'HomeworkAttach' AND `attachments`.container_id = `homework_attaches`.id LEFT OUTER JOIN `homework_for_courses` ON `homework_attaches`.bid_id = `homework_for_courses`.bid_id LEFT OUTER JOIN `homework_for_courses` AS H_C ON `attachments`.container_type = 'Bid' AND `attachments`.container_id = H_C.bid_id WHERE (`homework_for_courses`.course_id = 117 OR H_C.course_id = 117 OR (`attachments`.container_type = 'Course' AND `attachments`.container_id = 117)) AND `attachments`.filename LIKE '%#{keywords}%'").reorder("created_on DESC")
   end
 
+  def find_project_attache keywords,project,sort = ""
+    if sort == ""
+      sort =  "created_on DESC"
+    end
+    ids = ""
+    len = 0
+    count = project.versions.count
+    project.versions.each do |version|
+      len = len + 1
+      if len != count
+        ids += version.id.to_s + ','
+      else
+        ids += version.id.to_s
+      end
+    end
+    resultSet = Attachment.where("((attachments.container_type = 'Project' And attachments.container_id = '#{project.id}') OR (container_type = 'Version' AND container_id IN (#{ids}))) AND filename LIKE :like ", like: "%#{keywords}%").
+       reorder(sort)
+    #resultSet = Attachment.find_by_sql("SELECT `attachments`.* FROM `attachments` LEFT OUTER JOIN `homework_attaches` ON `attachments`.container_type = 'HomeworkAttach' AND `attachments`.container_id = `homework_attaches`.id LEFT OUTER JOIN `homework_for_courses` ON `homework_attaches`.bid_id = `homework_for_courses`.bid_id LEFT OUTER JOIN `homework_for_courses` AS H_C ON `attachments`.container_type = 'Bid' AND `attachments`.container_id = H_C.bid_id WHERE (`homework_for_courses`.course_id = 117 OR H_C.course_id = 117 OR (`attachments`.container_type = 'Course' AND `attachments`.container_id = 117)) AND `attachments`.filename LIKE '%#{keywords}%'").reorder("created_on DESC")
+  end
+
   def find_public_attache keywords,sort = ""
     # StoresController#search 将每条文件都查出来，再次进行判断过滤。---> resultSet.to_a.map
     # 此时内容不多速度还可，但文件增长，每条判断多则进行3-4次表连接。
@@ -132,17 +186,27 @@ class FilesController < ApplicationController
               attribute = "downloads"
             when "created_on"
               attribute = "created_on"
+            when "quotes"
+              attribute = "quotes"
+            else
+              attribute = "created_on"
           end
-
-          if order_by.count == 1
-            sort += "#{Attachment.table_name}.#{attribute} asc " if attribute
-          elsif order_by.count == 2
-            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} " if attribute && order_by[1]
-          end
-          if sort_type != params[:sort].split(",").last
-            sort += ","
+          @sort = order_by[0]
+          @order = order_by[1]
+          if order_by.count == 1 && attribute
+            sort += "#{Attachment.table_name}.#{attribute} asc "
+            if sort_type != params[:sort].split(",").last
+              sort += ","
+            end
+          elsif order_by.count == 2 && order_by[1]
+            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+            if sort_type != params[:sort].split(",").last
+              sort += ","
+            end
           end
         end
+      else
+        sort = "#{Attachment.table_name}.created_on desc"
       end
 
       @containers = [ Project.includes(:attachments).find(@project.id)]
@@ -184,6 +248,8 @@ class FilesController < ApplicationController
               attribute = "created_on"
             when "quotes"
               attribute = "quotes"
+            else
+            attribute = "created_on"
           end
           @sort = order_by[0]
           @order = order_by[1]
@@ -199,6 +265,8 @@ class FilesController < ApplicationController
             end
           end
         end
+      else
+        sort = "#{Attachment.table_name}.created_on desc"
       end
 
       @containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
@@ -215,6 +283,11 @@ class FilesController < ApplicationController
     @can_quote = attachment_candown @file
   end
 
+  def quote_resource_show_project
+    @file = Attachment.find(params[:id])
+    @can_quote = attachment_candown @file
+  end
+
   def new
     @versions = @project.versions.sort
     @course_tag = @project.project_type
@@ -241,7 +314,7 @@ class FilesController < ApplicationController
        render_attachment_warning_if_needed(container)
 
        if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
-         Mailer.attachments_added(attachments[:files]).deliver
+         Mailer.run.attachments_added(attachments[:files])
        end
 
        # TODO: 临时用 nyan
@@ -270,7 +343,7 @@ class FilesController < ApplicationController
        attachments = Attachment.attach_filesex(@course, params[:attachments], params[:attachment_type])
 
        if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
-         Mailer.attachments_added(attachments[:files]).deliver
+         Mailer.run.attachments_added(attachments[:files])
        end
 
        # TODO: 临时用 nyan

app/controllers/forums_controller.rb

@@ -1,7 +1,7 @@
 # added by fq
 class ForumsController < ApplicationController
   layout "users_base"
-
+  include ApplicationHelper
   # GET /forums
   # GET /forums.json
   before_filter :find_forum_if_available
@@ -63,6 +63,11 @@ class ForumsController < ApplicationController
 
     respond_to do |format|
       if @memo.save
+        if params[:asset_id]
+         ids = params[:asset_id].split(',')
+         update_kindeditor_assets_owner ids ,@memo.id,OwnerTypeHelper::MEMO
+        end
+        #end
         format.html { redirect_to (forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id))), notice: "#{l :label_memo_create_succ}" }
         format.json { render json: @memo, status: :created, location: @memo }
       else
@@ -163,6 +168,15 @@ class ForumsController < ApplicationController
     @forum = Forum.new(params[:forum])
     @forum.creator_id = User.current.id
     if @forum.save
+      # Time 2015-03-24 17:07:05
+      # Author lizanle
+      # Description after save后需要进行资源记录的更新
+      # owner_type = 2 对应的是 forum
+      if params[:asset_id]
+        ids = params[:asset_id].split(',')
+        update_kindeditor_assets_owner ids ,@forum.id,OwnerTypeHelper::FORUM
+      end
+      #end
       respond_to do |format|
 
           format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }

app/controllers/homework_attach_controller.rb

@@ -22,6 +22,7 @@ class HomeworkAttachController < ApplicationController
   #获取未批作业列表
   def get_not_batch_homework
     @not_batch_homework = true
+    @search_name = params[:name]
     sort, direction = params[:sort] || "s_socre", params[:direction] || "desc"
     get_not_batch_homework_list sort,direction, @bid.id
     @cur_page = params[:page] || 1
@@ -39,6 +40,7 @@ class HomeworkAttachController < ApplicationController
 
   #获取已评作业列表
   def get_batch_homeworks
+    @search_name = params[:name]
     sort, direction = params[:sort] || "s_socre", params[:direction] || "desc"
     @is_batch_homeworks = true
     if sort == 't_socre'
@@ -49,11 +51,12 @@ class HomeworkAttachController < ApplicationController
       order_by = "created_at #{direction}"
     end
     all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
-            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
+            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL AND stars > 0 ORDER BY updated_at DESC limit 0,1) AS t_score,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
             FROM homework_attaches WHERE bid_id = #{@bid.id}
             ORDER BY #{order_by}) AS table1
             WHERE table1.t_score IS NOT NULL")
+    all_homework_list = search_homework_member(all_homework_list,@search_name.to_s.downcase) if @search_name
     @cur_page = params[:page] || 1
     @cur_type = 2
     @homework_list = paginateHelper all_homework_list,10
@@ -72,6 +75,7 @@ class HomeworkAttachController < ApplicationController
   #获取所有作业列表
   def get_homeworks
     @is_all_homeworks = true
+    @search_name = params[:name]
     sort, direction = params[:sort] || "s_socre", params[:direction] || "desc"
     if sort == 't_socre'
       order_by = "t_score  #{direction}"
@@ -85,6 +89,8 @@ class HomeworkAttachController < ApplicationController
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
             FROM homework_attaches WHERE bid_id = #{@bid.id}
             ORDER BY #{order_by}")
+
+    all_homework_list = search_homework_member(all_homework_list,@search_name.to_s.downcase) if @search_name
     @cur_page = params[:page] || 1
     @cur_type = 3
     @homework_list = paginateHelper all_homework_list,10
@@ -477,7 +483,7 @@ class HomeworkAttachController < ApplicationController
       get_not_batch_homework_list params[:cur_sort] || "s_socre",params[:cur_direction] || "desc",@homework.bid_id
     elsif @cur_type == "2" #老师已批列表
       @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
-            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
+            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL AND stars > 0 ORDER BY updated_at DESC limit 0,1) AS t_score,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
             FROM homework_attaches WHERE id = #{@homework.id}").first
     elsif @cur_type == "3" #全部作业列表
@@ -538,6 +544,14 @@ class HomeworkAttachController < ApplicationController
   end
 
   private
+  #根据条件过滤作业结果
+  def search_homework_member homeworks,name
+    select_homework = homeworks.select{ |homework|
+      homework.user[:login].to_s.downcase.include?(name) ||  homework.user.user_extensions[:student_id].to_s.downcase.include?(name) || (homework.user[:lastname].to_s.downcase + homework.user[:firstname].to_s.downcase).include?(name)
+    }
+    select_homework
+  end
+
   #验证是否显示课程
   def can_show_course
     @first_page = FirstPage.find_by_page_type('project')
@@ -596,7 +610,8 @@ class HomeworkAttachController < ApplicationController
         (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
         FROM homework_attaches WHERE bid_id = #{bid_id}
         ORDER BY #{order_by}) AS table1
-        WHERE table1.t_score IS NULL")
+        WHERE table1.t_score IS NULL OR table1.t_score = 0 ")
+    @all_homework_list = search_homework_member(@all_homework_list,@search_name.to_s.downcase) if @search_name
     @homework_list = paginateHelper @all_homework_list,10
   end
 

app/controllers/members_controller.rb

@@ -133,6 +133,9 @@ class MembersController < ApplicationController
       elsif @course
         course_info = []
         if params[:membership]
+          @create_member_error_messages = "角色不能留空" unless params[:membership][:role_ids]
+          @create_member_error_messages = "用户不能留空" unless params[:membership][:user_ids]
+
           if params[:membership][:user_ids]
             attrs = params[:membership].dup
             user_ids = attrs.delete(:user_ids)
@@ -140,7 +143,7 @@ class MembersController < ApplicationController
               member =  Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
               role = Role.find_by_id(params[:membership][:role_ids])
               # 这里的判断只能通过角色名，可以弄成常量
-              if role.name == "学生" || role.name == "Student"
+              if role && (role.name == "学生" || role.name == "Student")
                 StudentsForCourse.create(:student_id => user_id, :course_id =>@course.id)
               end
               members << member
@@ -159,6 +162,11 @@ class MembersController < ApplicationController
           end
           @course.members << members
           @course.course_infos << course_info
+
+          @roles = Role.givable.all[3..5]
+          members = @course.member_principals.includes(:roles, :principal).all.sort
+        else
+          @create_member_error_messages = l(:label_user_role_null)
         end
         respond_to do |format|
           format.html { redirect_to_settings_in_courses }
@@ -242,6 +250,9 @@ class MembersController < ApplicationController
             end
           end
         end
+        @roles = Role.givable.all[3..5]
+        @members = @course.member_principals.includes(:roles, :principal).all.sort
+        @member = @course.members.new
       end
 
       saved = @member.save
@@ -304,7 +315,8 @@ class MembersController < ApplicationController
         joined.each do |join|
           join.delete
         end
-
+        @roles = Role.givable.all[3..5]
+        @members = @course.member_principals.includes(:roles, :principal).all.sort
       end
       respond_to do |format|
         format.html { redirect_to_settings_in_courses }

app/controllers/memos_controller.rb

@@ -59,6 +59,20 @@ class MemosController < ApplicationController
     @memo.content = @quote + @memo.content
     respond_to do |format|
       if @memo.save
+        # Time 2015-03-24 14:47:05
+        # Author lizanle
+        # Description after save后需要进行资源记录的更新
+        # owner_type = 1 对应的是 memo
+        if !params[:asset_id].nil?
+          ids = params[:asset_id].split(',')
+          ids.each do |id|
+            asset = Kindeditor::Asset.find(id.to_i)
+            asset.owner_id = @memo.id
+            asset.owner_type = 1
+            asset.save
+          end
+        end
+        #end
         format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
         format.json { render json: @memo, status: :created, location: @memo }
       else

app/controllers/messages_controller.rb

@@ -44,18 +44,35 @@ class MessagesController < ApplicationController
     end
 
     @reply_count = @topic.children.count
-    @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
-    @replies =  @topic.children.
-      includes(:author, :attachments, {:board => :project}).
-      reorder("#{Message.table_name}.created_on DESC").
-      limit(@reply_pages.per_page).
-      offset(@reply_pages.offset).
-      all
+    # @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
+    # @replies =  @topic.children.
+    #   includes(:author, :attachments, {:board => :project}).
+    #   reorder("#{Message.table_name}.created_on DESC").
+    #   limit(@reply_pages.per_page).
+    #   offset(@reply_pages.offset).
+    #   all
 
     @reply = Message.new(:subject => "RE: #{@message.subject}")
     if @course
+      messages_replies =  @topic.children.
+          includes(:author, :attachments, {:board => :project}).
+          reorder("#{Message.table_name}.created_on DESC").
+          #limit(@reply_pages.per_page).
+          #offset(@reply_pages.offset).
+          all
+      @replies = paginateHelper messages_replies,10
+      @reply = Message.new(:subject => "RE: #{@message.subject}")
       render :action => "show", :layout => "base_courses"#by young
     else
+      @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
+      @replies =  @topic.children.
+          includes(:author, :attachments, {:board => :project}).
+          reorder("#{Message.table_name}.created_on DESC").
+          limit(@reply_pages.per_page).
+          offset(@reply_pages.offset).
+          all
+
+      @reply = Message.new(:subject => "RE: #{@message.subject}")
       render :action => "show", :layout => "base_projects"#by young
     end
   end
@@ -69,6 +86,11 @@ class MessagesController < ApplicationController
     if request.post?
       @message.save_attachments(params[:attachments])
       if @message.save
+        # 更新kindeditor上传的图片资源所有者
+        if params[:asset_id]
+          ids = params[:asset_id].split(',')
+          update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
+        end
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
         render_attachment_warning_if_needed(@message)
         redirect_to board_message_url(@board, @message)
@@ -76,6 +98,13 @@ class MessagesController < ApplicationController
         layout_file = @project ? 'base_projects' : 'base_courses'
         render :action => 'new', :layout => layout_file
       end
+    else
+      respond_to do |format|
+        format.html {
+          layout_file = @project ? 'base_projects' : 'base_courses'
+          render :layout => layout_file
+        }
+      end
     end
   end
 
@@ -93,6 +122,10 @@ class MessagesController < ApplicationController
     @topic.children << @reply
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
+      if params[:asset_id]
+       ids = params[:asset_id].split(',')
+       update_kindeditor_assets_owner ids,@reply.id,OwnerTypeHelper::MESSAGE
+      end
       call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
       attachments = Attachment.attach_files(@reply, params[:attachments])
       render_attachment_warning_if_needed(@reply)
@@ -159,16 +192,7 @@ class MessagesController < ApplicationController
 
     @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
     @temp = Message.new
-    #@temp.content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}> "
-    @content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
-    @content_html = textilizable(@content)
-    @temp.content = @content_html
-    #@content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)} <br/> &nbsp; "
-    #@content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n") + "</blockquote>\n\n<br/>"
-    #@content = "<blockquote>" << @content
-    #@temp = Message.new
-    #@temp.content = @content
-
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
   end
 
   def preview

app/controllers/news_controller.rb

@@ -17,6 +17,7 @@
 
 class NewsController < ApplicationController
   layout 'base_projects'# by young
+  include ApplicationHelper
   before_filter :authorize1, :only => [:show]
   default_search_scope :news
   model_object News
@@ -70,13 +71,13 @@ class NewsController < ApplicationController
         scope = @course ? @course.news.course_visible : News.course_visible
 
         @news_count = scope.count
-        @news_pages = Paginator.new @news_count, @limit, params['page']
-        @offset ||= @news_pages.offset
-        @newss = scope.all(:include => [:author, :course],
-                           :order => "#{News.table_name}.created_on DESC",
-                           :offset => @offset,
-                           :limit => @limit)
-
+        #@news_pages = Paginator.new @news_count, @limit, params['page']
+        #@offset ||= scope_page.offset
+        scope_order = scope.all(:include => [:author, :course],
+                           :order => "#{News.table_name}.created_on DESC")
+                           # :offset => @offset,
+                           # :limit => @limit)
+        @newss = paginateHelper scope_order,10
         respond_to do |format|
           format.html {
             @news = News.new
@@ -136,6 +137,10 @@ class NewsController < ApplicationController
       @news.safe_attributes = params[:news]
       @news.save_attachments(params[:attachments])
       if @news.save
+        if params[:asset_id]
+          ids = params[:asset_id].split(',')
+          update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
+        end
         render_attachment_warning_if_needed(@news)
         flash[:notice] = l(:notice_successful_create)
         redirect_to course_news_index_url(@course)

app/controllers/projects_controller.rb

@@ -336,11 +336,11 @@ class ProjectsController < ApplicationController
   def send_mail_to_member
     if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
       email = params[:mail]
-      Mailer.send_invite_in_project(email, @project, User.current).deliver
+      Mailer.run.send_invite_in_project(email, @project, User.current)
       @is_zhuce =false
       flash[:notice] = l(:notice_email_sent, :value => email)
     else
-      flash[:error] = l(:notice_registed_success, :value => email)
+      flash[:error] = l(:notice_registed_error, :value => email)
       @is_zhuce = true
     end
     respond_to do |format|