Merge branch 'szzh' into sw_new_course

Conflicts:
	Gemfile
	app/controllers/courses_controller.rb
	app/views/attachments/_form.html.erb
	app/views/attachments/_form_course.html.erb
	app/views/files/_attachement_list.html.erb
	app/views/layouts/base.html.erb
	app/views/layouts/base_projects.html.erb
	config/locales/zh.yml
	public/javascripts/attachments.js

.gitignore

@@ -22,3 +22,4 @@
 .DS_Store
 public/api_doc/
 /.metadata
+vendor/cache

Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'http://ruby.taobao.org'
 #source 'http://ruby.sdutlinux.org/'
 
 unless RUBY_PLATFORM =~ /w32/
@@ -10,11 +10,11 @@ end
 
 gem 'grape', '~> 0.9.0'
 gem 'grape-entity'
-gem 'seems_rateable', path: 'lib/seems_rateable'
+gem 'seems_rateable', '~> 1.0.13'
 gem "rails", "3.2.13"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
-gem "coderay", "~> 1.0.6"
+gem 'coderay', '~> 1.1.0'
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
 gem 'acts-as-taggable-on', '2.4.1'
@@ -23,14 +23,20 @@ gem 'ruby-ole'
 #gem 'email_verifier', path: 'lib/email_verifier'
 gem 'rufus-scheduler'
 #gem 'dalli', path: 'lib/dalli-2.7.2'
+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'
-  #gem 'puma'
-  # gem 'pry-rails'
-  # gem 'pry-byebug'
-  gem 'better_errors', path: 'lib/better_errors'
-  gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
+  gem 'puma' if RbConfig::CONFIG['host_os'] =~ /linux/
+  gem 'pry-rails'
+  if RUBY_VERSION >= '2.0.0'
+    gem 'pry-byebug'
+  else
+    gem 'pry-debugger'
+  end
+  gem 'pry-stack_explorer'
+  gem 'better_errors', '~> 1.1.0'
+  gem 'rack-mini-profiler', '~> 0.9.3'
 end
 
 group :test do

app/api/mobile/apis/comments.rb

@@ -2,6 +2,7 @@
 module Mobile
   module Apis
     class Comments < Grape::API
+      include ApplicationHelper
       resource :comments do
         desc '课程通知评论'
         params do
@@ -82,8 +83,8 @@ module Mobile
               memo: {:subject => params[:subject],:content => '该贴来自手机App意见反馈'},
           }
           cs = CommentService.new
-          memo = cs.create_feedback cs_params, current_user
-          raise "commit failed #{memo.errors.full_messages}" if memo.new_record?
+          memo,message = cs.create_feedback cs_params, current_user
+          raise message if memo.new_record?
           present :status, 0
         end
 

app/api/mobile/apis/users.rb

@@ -82,7 +82,7 @@ module Mobile
         desc "用户搜索"
         params do
           requires :name, type: String, desc: '用户名关键字'
-          requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱'
+          requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱,3 昵称和姓名'
         end
         get 'search/search_user' do
           us = UsersService.new

app/api/mobile/entities/course_dynamic.rb

@@ -15,6 +15,8 @@ module Mobile
       course_dynamic_expose :type
       course_dynamic_expose :count
       course_dynamic_expose :course_name
+      course_dynamic_expose :course_term
+      course_dynamic_expose :course_time
       course_dynamic_expose :course_id
       course_dynamic_expose :course_img_url
       course_dynamic_expose :message

app/controllers/courses_controller.rb

@@ -678,11 +678,13 @@ class CoursesController < ApplicationController
         "show_course_news" => true,
         "show_course_messages" => true,
         "show_bids" => true,
-        "show_course_journals_for_messages" => true
+        "show_course_journals_for_messages" => true,
+        "show_homeworks" => true
     }
     @date_to ||= Date.today + 1
     @date_from = (@date_to - @days) > @course.created_at.to_date ? (@date_to - @days) : @course.created_at.to_date
     @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
+    @author ||= @course.teacher
     # 决定显示所用用户或单个用户活动
     @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
                                                :with_subprojects => false,

app/controllers/discuss_demos_controller.rb

@@ -0,0 +1,42 @@
+class DiscussDemosController < ApplicationController
+  def index
+
+    @discuss_demo_list = DiscussDemo.where("body is not null").order("created_at desc").page(params[:page] || 1).per(10)
+  end
+
+  def new
+    @discuss_demo = DiscussDemo.create
+    @discuss_demo.save!
+    @discuss_demo
+  end
+
+  def create
+
+  end
+
+  def update
+    @discuss_demo = DiscussDemo.find(params[:id])
+    @discuss_demo.update_attributes(:title =>  params[:discuss_demo][:title],:body =>  params[:discuss_demo][:body])
+    redirect_to :controller=> 'discuss_demos',:action => 'show',:id => params[:id]
+  end
+
+  def delete
+
+  end
+
+  def destroy
+    asset = Kindeditor::Asset.find_by_owner_id(params[:id])
+    if !asset.nil?
+      filepath = File.join(Rails.root,"public","files","uploads",
+                           asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s,
+                           asset[:asset].to_s)
+      File.delete(filepath) if File.exist?filepath
+    end
+    DiscussDemo.destroy(params[:id])
+    redirect_to :controller=> 'discuss_demos',:action => 'index'
+  end
+
+  def show
+    @discuss_demo = DiscussDemo.find(params[:id])
+  end
+end

app/controllers/documents_controller.rb

@@ -91,6 +91,7 @@ class DocumentsController < ApplicationController
 
   def update
     @document.safe_attributes = params[:document]
+    @document.save_attachments(params[:attachments])
     if request.put? and @document.save
       flash[:notice] = l(:notice_successful_update)
       redirect_to document_url(@document)

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
@@ -20,7 +20,7 @@ class ForumsController < ApplicationController
       #@memo.author_id = User.current.id
       #@forum = @memo.forum
       cs = CommentService.new
-      @memo = cs.create_feedback params,User.current
+      @memo,message = cs.create_feedback params,User.current
       respond_to do |format|
         if !@memo.new_record?
           format.html { redirect_to forum_path(@memo.forum) }
@@ -63,6 +63,9 @@ class ForumsController < ApplicationController
 
     respond_to do |format|
       if @memo.save
+        ids = params[:asset_id].split(',')
+        update_kindeditor_assets_owner ids ,@memo.id,1
+        #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 +166,13 @@ 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
+      ids = params[:asset_id].split(',')
+      update_kindeditor_assets_owner ids ,@forum.id,2
+      #end
       respond_to do |format|
 
           format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }

app/controllers/git_callback_controller.rb

@@ -0,0 +1,9 @@
+class GitCallbackController < ApplicationController
+
+  def post_update
+    @repository = Repository.find_by_root_url(params[:root_url])
+    @repository.fetch_changesets
+    render :text => 'success'
+  end
+
+end

app/controllers/issues_controller.rb

@@ -58,7 +58,7 @@ class IssuesController < ApplicationController
 
   def index
     retrieve_query
-    sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
+    sort_init(@query.sort_criteria.empty? ? [['updated_on', 'desc']] : @query.sort_criteria)
     sort_update(@query.sortable_columns)
     @query.sort_criteria = sort_criteria.to_a
 
@@ -162,7 +162,8 @@ class IssuesController < ApplicationController
       respond_to do |format|
         format.html {
           render_attachment_warning_if_needed(@issue)
-          flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.source_from}", issue_path(@issue), :title => @issue.subject))
+          flash[:notice] = l(:label_successful_create)
+          #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.subject}", issue_path(@issue), :title => @issue.subject))
           #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
           if params[:continue]
             attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
@@ -381,7 +382,7 @@ class IssuesController < ApplicationController
   def retrieve_previous_and_next_issue_ids
     retrieve_query_from_session
     if @query
-      sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
+      sort_init(@query.sort_criteria.empty? ? [['updated_on', 'desc']] : @query.sort_criteria)
       sort_update(@query.sortable_columns, 'issues_index_sort')
       limit = 500
       issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])

app/controllers/members_controller.rb

@@ -109,7 +109,7 @@ class MembersController < ApplicationController
         end
         if params[:flag]
           unless members.present? && members.all? {|m| m.valid? }
-            flash[:error] = members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ')
+            flash[:error] = members.empty? ? l(:label_user_role_null) :members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ')
           else
             flash[:notice] = l(:label_invite_success)
           end

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/projects_controller.rb

@@ -340,6 +340,7 @@ class ProjectsController < ApplicationController
       @is_zhuce =false
       flash[:notice] = l(:notice_email_sent, :value => email)
     else
+      flash[:error] = l(:notice_registed_error, :value => email)
       @is_zhuce = true
     end
     respond_to do |format|

app/controllers/repositories_controller.rb

@@ -92,6 +92,22 @@ class RepositoriesController < ApplicationController
     render :action => 'show', :layout => 'base_projects'
   end
 
+
+  HOOK_TEMPLATE = %Q{#!/bin/sh
+exec sh -c '
+function update()
+{
+        CMD_PATH=`dirname $0`;
+        cd $CMD_PATH;
+        PY_PATH=$PWD/../../git_refresh_changes.py;
+        [[ -s "$PY_PATH"   ]] && $(which python) $PY_PATH $PWD;
+        cd -;
+}
+git update-server-info
+update
+'
+  }
+
   def create
     if params[:repository_scm].to_s == 'Gitlab'
       # add by nwb
@@ -127,7 +143,6 @@ class RepositoriesController < ApplicationController
       if attrs[:attrs_extra].keys.any?
         @repository.merge_extra_info(attrs[:attrs_extra])
       end
-      #by xianbo
 
       @repository.project = @project
       if request.post? && @repository.save
@@ -145,12 +160,11 @@ class RepositoriesController < ApplicationController
                      "</Limit> \n ' >> "+
                      @root_path+"htdocs/"+ @repository_name+"/.htaccess"
           system "cd "+@project_path+" ;git update-server-info"
-          # if(create_repo_file&&create_passwd&&create_group&&init_repository&&add_privilege&&init_server_info)
-          # else
-          # logger.info "An error occured when authenticating "+"create passwd"+@creat_passwd+"create_group"+
-          # crate_group+"create repository file "+create_repo_file+"init repository"+init_repostory+
-          # "aad privilege to rpository"+add_privilege+"init server infos"+init_server_info
-          # end
+
+          File.open(@project_path+"/hooks/post-update", "w+") do |f|
+            f.write(HOOK_TEMPLATE)
+          end
+
           @repository.update_attributes(:login => User.current.login.to_s)
         end
         redirect_to settings_project_url(@project, :tab => 'repositories')
@@ -160,6 +174,8 @@ class RepositoriesController < ApplicationController
              render :action => 'new', :layout =>'base_projects'
            end
       end
+
+
     end
   end
   

app/controllers/welcome_controller.rb

@@ -20,7 +20,7 @@ class WelcomeController < ApplicationController
   include WelcomeHelper
   helper :project_score
   caches_action :robots
-  before_filter :find_first_page, :only => [:index]
+  #before_filter :find_first_page, :only => [:index]
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  

app/helpers/api_helper.rb

@@ -60,4 +60,8 @@ module ApiHelper
     end
     [count,is_teacher]
   end
+
+  def get_user_language user
+    (user.language.nil? || user.language == "") ? 'zh':user.language
+  end
 end

app/helpers/application_helper.rb

@@ -33,6 +33,35 @@ module ApplicationHelper
   extend Forwardable
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
 
+  # Time 2015-03-24 15:27:29
+  # Author lizanle
+  # Description 从硬盘上删除对应的资源文件
+  def delete_kindeditor_assets_from_disk owner_id,owner_type
+    assets = Kindeditor::Asset.where(["owner_id = ? and owner_type = ?",owner_id,owner_type])
+    if !assets.nil? && !assets.blank?
+      assets.all.each do |asset|
+        next if asset.nil?
+        filepath = File.join(Rails.root,"public","files","uploads",
+                             asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s,
+                             asset[:asset].to_s)
+        File.delete(filepath) if File.exist?filepath
+      end
+    end
+  end
+
+  # Time 2015-03-24 16:38:05
+  # Author lizanle
+  # Description after save后需要进行资源记录的更新
+  # owner_type = 1 对应的是 memo
+  def update_kindeditor_assets_owner ids,owner_id,owner_type
+    ids.each do |id|
+      asset = Kindeditor::Asset.find(id.to_i)
+      asset.owner_id = owner_id
+      asset.owner_type = owner_type
+      asset.save
+    end
+  end
+
   # Added by young
   # Define the course menu's link class
   # 不是数组的转化成数组，然后判断当前menu_item是否在给定的列表
@@ -2019,4 +2048,10 @@ module ApplicationHelper
     end
     technical_title
   end
+
+
+  def ie8?
+    request.env["HTTP_USER_AGENT"] =~ /MSIE 8.0/
+  end
+
 end

app/helpers/courses_helper.rb

@@ -389,7 +389,7 @@ module CoursesHelper
   # 课程time+term简写（2014.春/2014.秋）国际化输出
   def get_course_term course
     strterm = course.try(:term).to_s
-    if !(User.current.language == 'zh')
+    if !(User.current.language == 'zh'||User.current.language == '')
       strterm == '春季学期' ? strterm =  'spring term' : strterm =  'autumn term'
       str = ( course.try(:time).to_s << '.' << strterm )
       str[0..-6]
@@ -403,7 +403,7 @@ module CoursesHelper
   # 课程term（春季学期/秋季学期）国际化输出
   def get_course_term_locales course
     str = course.try(:term).to_s
-    if !(User.current.language == 'zh')
+    if !(User.current.language == 'zh'||User.current.language == '')
       str == '春季学期' ? str =  ' ' + 'spring term' : str =  ' ' + 'autumn term'
     end
     return str

app/helpers/discuss_demos_helper.rb

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

app/helpers/files_helper.rb

@@ -87,7 +87,10 @@ module FilesHelper
   def visable_attachemnts attachments
     result = []
     attachments.each do |attachment|
-      if attachment.is_public? || (attachment.container_type == "Course" && User.current.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
+      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
         result << attachment
       end
     end

app/helpers/watchers_helper.rb

@@ -278,11 +278,48 @@ module WatchersHelper
     )
     method = applied ? 'delete' : 'post'
 
-    link_to text, url, :remote => true, :method => method ,:class=>css
+    link_to text, url,  :remote => true, :method => method , :class => css
   end
 
     def exit_project_link(project)
       link_to(l(:label_exit_project),exit_cur_project_path(project.id),
-        :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 22px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES" )
+                :remote => true, :confirm => l(:lable_sure_exit_project), 
+                :style => "color: #fff; display:block;font-size:12px; padding: 0px 5px; margin-right: 10px; height: 20px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" )
+    end  
+    
+    #项目关注、取消关注
+    #REDO:项目样式确定后方法需要对CSS变量进行改进
+    def watcher_link_for_project(objects, user, options=[])
+      return '' unless user && user.logged?
+      objects = Array.wrap(objects)
+      watched = objects.any? {|object| object.watched_by?(user)}
+      @watch_flag = objects.first.instance_of?(Project)
+      id = watcher_css(objects)
+      text = @watch_flag ?
+                    (watched ? l(:button_unfollow) : l(:label_button_following)) : (watched ? l(:button_unwatch) : l(:label_button_following))
+      url = watch_path(:object_type => objects.first.class.to_s.underscore,
+                       :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort))
+      method = watched ? 'delete' : 'post'
+      link_to text, url, :remote => true, :method => method,
+                         :class => "project_watch_new" ,:id=>id
+     end
+    
+    #申请加入项目
+    def join_in_project_link(project, user, options=[])
+      return '' unless user && user.logged?
+      applied = project.applied_projects.find_by_user_id(user.id)
+      text = applied ? l(:label_unapply_project) : l(:label_apply_project)
+      @applied_flag = project.instance_of?(Project)      
+      if applied
+        appliedid =  applied.id
+      end
+      id = applied_css(project)
+      url = appliedproject_path(
+        :id=>appliedid,
+        :user_id => user.id,
+        :project_id => project.id)
+      method = applied ? 'delete' : 'post'
+      link_to text, url,  :remote => true, :method => method , :class => "project_watch_new",:id => id
     end
+
   end