解决冲突

.gitignore

@@ -6,6 +6,7 @@
 /config/database.yml
 /config/configuration.yml
 /config/additional_environment.rb
+
 /files/*
 /log/*
 /public/tmp/*

Gemfile

@@ -1,83 +1,84 @@
-source 'http://ruby.taobao.org'
-#source 'http://ruby.sdutlinux.org/'
-
-unless RUBY_PLATFORM =~ /w32/
-  # unix-like only
-  gem 'iconv'
-end
-
-gem "mysql2", "= 0.3.18"
-gem 'redis-rails'
-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'
-gem "rails", "3.2.13"
-gem "jquery-rails", "~> 2.0.2"
-gem "i18n", "~> 0.6.0"
-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'
-gem 'spreadsheet'
-gem 'ruby-ole'
-gem 'rails_kindeditor',path:'lib/rails_kindeditor'
-gem "rmagick", ">= 2.0.0"
-
-group :development do
-  gem 'grape-swagger'
-  gem 'better_errors', '~> 1.1.0'
-  gem 'rack-mini-profiler', '~> 0.9.3'
-end
-
-group :development, :test do 
-  unless RUBY_PLATFORM =~ /w32/
-    gem 'pry-rails'
-    if RUBY_VERSION >= '2.0.0'
-      gem 'pry-byebug'
-    end
-    gem 'pry-stack_explorer'
-  end
-
-  gem 'rspec-rails', '~> 3.0'
-  gem 'factory_girl_rails'
-end
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-   gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier', '>= 1.0.3'
-end
-
-# Optional gem for LDAP authentication
-group :ldap do
-  gem "net-ldap", "~> 0.3.1"
-end
-
-
-# Optional gem for OpenID authentication
-group :openid do
-  gem "ruby-openid", "~> 2.1.4", :require => "openid"
-  gem "rack-openid"
-end
-
-
-database_file = File.join(File.dirname(__FILE__), "config/database.yml")
-if File.exist?(database_file)
-else
-  warn("Please configure your config/database.yml first")
-end
-
-# Load plugins' Gemfiles
-Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
-end
+source 'http://ruby.taobao.org'
+#source 'http://ruby.sdutlinux.org/'
+
+unless RUBY_PLATFORM =~ /w32/
+  # unix-like only
+  gem 'iconv'
+end
+
+gem 'rest-client'
+gem "mysql2", "= 0.3.18"
+gem 'redis-rails'
+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'
+gem "rails", "3.2.13"
+gem "jquery-rails", "~> 2.0.2"
+gem "i18n", "~> 0.6.0"
+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'
+gem 'spreadsheet'
+gem 'ruby-ole'
+gem 'rails_kindeditor',path:'lib/rails_kindeditor'
+#gem "rmagick", ">= 2.0.0"
+
+group :development do
+  gem 'grape-swagger'
+  gem 'better_errors', '~> 1.1.0'
+  gem 'rack-mini-profiler', '~> 0.9.3'
+end
+
+group :development, :test do 
+  unless RUBY_PLATFORM =~ /w32/
+    gem 'pry-rails'
+    if RUBY_VERSION >= '2.0.0'
+      gem 'pry-byebug'
+    end
+    gem 'pry-stack_explorer'
+  end
+
+  gem 'rspec-rails', '~> 3.0'
+  gem 'factory_girl_rails'
+end
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+   gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+# Optional gem for LDAP authentication
+group :ldap do
+  gem "net-ldap", "~> 0.3.1"
+end
+
+
+# Optional gem for OpenID authentication
+group :openid do
+  gem "ruby-openid", "~> 2.1.4", :require => "openid"
+  gem "rack-openid"
+end
+
+
+database_file = File.join(File.dirname(__FILE__), "config/database.yml")
+if File.exist?(database_file)
+else
+  warn("Please configure your config/database.yml first")
+end
+
+# Load plugins' Gemfiles
+Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
+end

app/api/mobile/apis/comments.rb

@@ -91,6 +91,7 @@ module Mobile
         desc '课程留言列表'
         params do
           optional :token, type: String
+          optional :page,type:Integer,desc:'页数'
         end
         get ':id/course_message' do
           cs = CommentService.new
@@ -99,6 +100,19 @@ module Mobile
           present :status, 0
         end
 
+        desc '留言详情'
+        params do
+          requires :token, type: String
+          requires :comment_parent_id,type:Integer,desc:'留言id'
+          optional :course_id,type:Integer,desc:'课程id'
+        end
+        get ':comment_parent_id/comment_details' do
+          cs = CommentService.new
+          jour = cs.comment_detail params,current_user
+          present :data, jour, with: Mobile::Entities::Jours
+          present :status, 0
+        end
+
       end
     end
   end

app/api/mobile/apis/courses.rb

@@ -258,7 +258,7 @@ module Mobile
           requires :course_id,type: Integer,desc: '课程id'
           optional :name,type:String,desc:'课件名称可能包含的字符'
         end
-        get ":course_id/attachments" do
+        post ":course_id/attachments" do
           cs = CoursesService.new
           count = cs.course_attachments params
           present :data, count, with: Mobile::Entities::Attachment

app/api/mobile/apis/users.rb

@@ -94,6 +94,59 @@ module Mobile
           present :status, 0
         end
 
+        desc "用户留言"
+        params do
+          requires :token, type: String
+          requires :user_id, type: Integer,desc: '被留言的用户id'
+          requires :page,type:Integer,desc:'请求数据的页码'
+        end
+        get ':user_id/messages' do
+          us = UsersService.new
+          jours = us.get_all_messages params
+          present :data,jours,with:Mobile::Entities::Jours
+          present :status,0
+        end
+
+        desc "回复用户留言"
+        params do
+          requires :token, type: String
+          requires :user_id, type: Integer,desc: '被留言的用户id'
+          requires :content,type:String,desc:'留言内容'
+          requires :ref_user_id,type:Integer,desc:'被回复的用户id'
+          requires :parent_id,type:Integer,desc:'留言父id'
+          requires :ref_message_id,type:Integer,desc:'引用消息id'
+          optional :type,type:Integer,desc:'回复类型'
+          optional :course_id,type:Integer,desc:'课程id'
+        end
+        post ':user_id/reply_message' do
+          us = UsersService.new
+          jours = us.reply_user_messages params,current_user
+          present :status,0
+        end
+
+        desc "给用户留言"
+        params do
+          requires :token, type: String
+          requires :user_id, type: Integer,desc:'被留言的用户id'
+          requires :content, type: String,desc:'留言内容'
+        end
+        post ':user_id/leave_message' do
+          us = UsersService.new
+          us.leave_message params,current_user
+          present :data,0
+        end
+
+        desc "与我相关"
+        params do
+          requires :token, type: String
+          requires :page,type:Integer,desc:'页码'
+        end
+        get ':user_id/all_my_dynamic' do
+          us = UsersService.new
+          my_jours = us.reply_my_messages params,current_user
+          present :data,my_jours,with:Mobile::Entities::Jours
+          present :status,0
+        end
       end
     end
   end

app/api/mobile/entities/jours.rb

@@ -14,6 +14,11 @@ module Mobile
             else
               f.send(field)
             end
+          else
+            case f
+              when :course_name
+                f[:jour_type] == "Course" ? f.course.name : ""
+            end
           end
         end
       end
@@ -27,6 +32,11 @@ module Mobile
       jours_expose :notes
       jours_expose :m_reply_id
       jours_expose :m_parent_id
+      expose :course,using:Mobile::Entities::Course do |f,opt|
+        if f.is_a?(::JournalsForMessage) && f[:jour_type] == "Course"
+          f.course
+        end
+      end
       expose :reply_user,using: Mobile::Entities::User do |f, opt|
         f.at_user
       end

app/controllers/account_controller.rb

@@ -338,6 +338,9 @@ class AccountController < ApplicationController
       :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
       :httponly => true
     }
+    if Redmine::Configuration['cookie_domain'].present?
+      cookie_options = cookie_options.merge(domain: Redmine::Configuration['cookie_domain'])
+    end
     cookies[autologin_cookie_name] = cookie_options
   end
 

app/controllers/application_controller.rb

@@ -199,7 +199,11 @@ class ApplicationController < ActionController::Base
   # Logs out current user
   def logout_user
     if User.current.logged?
-      cookies.delete(autologin_cookie_name)
+      if Redmine::Configuration['cookie_domain'].present?
+        cookies.delete(autologin_cookie_name, domain: Redmine::Configuration['cookie_domain'])
+      else
+        cookies.delete autologin_cookie_name
+      end
       # Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
       self.logged_user = nil
     end

app/controllers/attachments_controller.rb

@@ -69,9 +69,12 @@ class AttachmentsController < ApplicationController
     if candown || User.current.admin? || User.current.id == @attachment.author_id
       @attachment.increment_download
       if stale?(:etag => @attachment.digest)
-        send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-                  :type => detect_content_type(@attachment),
-                  :disposition => 'attachment'    #inline can open in browser
+        req = RestClient.post 'http://192.168.80.107/Any2HtmlHandler.ashx', :txtDes => File.new(@attachment.diskfile, 'rb')
+        render :text => req.body
+
+        # send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
+        #           :type => detect_content_type(@attachment),
+        #           :disposition => 'attachment'    #inline can open in browser
       end
 
     else

app/controllers/avatar_controller.rb

@@ -1,9 +1,9 @@
 class AvatarController < ApplicationController
-  
-     
+
+  include ActionView::Helpers::NumberHelper
   #before_filter :set_cache_buster   
   include AvatarHelper
-      
+
   def upload
     # Make sure that API users get used to set this content type
     # as it won't trigger Rails' automatic parsing of the request body for parameters
@@ -24,48 +24,58 @@ class AvatarController < ApplicationController
           else
             @image_file=params[:filename]
           end      
+          @temp_file = StringIO.new(@temp_file)
         end
       end
     end
 
     if  @temp_file && (@temp_file.size > 0)
-      diskfile=disk_filename(@source_type,@source_id)
-      @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
+      if @temp_file.size > Setting.upload_avatar_max_size.to_i
+        @status = 1
+        @msg = l(:error_upload_avatar_to_large, :max_size => number_to_human_size(Setting.upload_avatar_max_size.to_i))
+      elsif Trustie::Utils::Image.new(@temp_file).image?
+        diskfile=disk_filename(@source_type,@source_id)
+        @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
 
-      # 用户头像上传时进行特别处理
-      if  @source_type == 'User'
+        # 用户头像上传时进行特别处理
+        if  @source_type == 'User'
           diskfile += "temp"
           @urlfile += "temp"
-      end
+        end
 
-      logger.info("Saving avatar '#{diskfile}' (#{@temp_file.size} bytes)")
-      path = File.dirname(diskfile)
-      unless File.directory?(path)
-        FileUtils.mkdir_p(path)
-      end
-      md5 = Digest::MD5.new
-      File.open(diskfile, "wb") do |f|
-        if @temp_file.respond_to?(:read)
-          buffer = ""
-          while (buffer = @temp_file.read(8192))
-            f.write(buffer)
-            md5.update(buffer)
+        logger.info("Saving avatar '#{diskfile}' (#{@temp_file.size} bytes)")
+        path = File.dirname(diskfile)
+        unless File.directory?(path)
+          FileUtils.mkdir_p(path)
+        end
+        md5 = Digest::MD5.new
+        File.open(diskfile, "wb") do |f|
+          if @temp_file.respond_to?(:read)
+            @temp_file.rewind
+            buffer = ""
+            while (buffer = @temp_file.read(8192))
+              f.write(buffer)
+              md5.update(buffer)
+            end
+          else
+            f.write(@temp_file)
+            md5.update(@temp_file)
           end
-        else
-        f.write(@temp_file)
-        md5.update(@temp_file)
         end
+
+        Trustie::Utils::Image.new(diskfile,true).compress(300)
+        @status = 0
+        @msg = ''
+      else
+        @status = 2
+        @msg = l(:not_valid_image_file)
       end
-#    self.digest = md5.hexdigest
     end
     @temp_file = nil
 
-    image = Trustie::Utils::Image.new(diskfile,true)
-    image.compress(300)
-
     respond_to do |format|
       format.json{
-        render :inline => "#{@urlfile.to_s}?#{Time.now.to_i}",:content_type => 'text/html'
+        render :inline => {status: @status, message:@msg, url:"#{@urlfile.to_s}?#{Time.now.to_i}"}.to_json,:content_type => 'text/html'
         return
       }
       format.js

app/controllers/bids_controller.rb

@@ -675,11 +675,12 @@ class BidsController < ApplicationController
   #删除作业
   #by xianbo
   def homework_destroy
-    @bid_to_destroy = Bid.find params[:course_id]
+    @bid_to_destroy = Bid.find params[:id]
+    course_url = course_homework_path(@bid_to_destroy.courses.first)
     (render_403; return false) unless User.current.admin?||User.current.id==@bid_to_destroy.author_id
     @bid_to_destroy.destroy
     respond_to do |format|
-      format.html { redirect_to :back }
+      format.html { redirect_to course_url }
       format.js
       #format.api { render_api_ok }
     end

app/controllers/boards_controller.rb

@@ -32,13 +32,17 @@ class BoardsController < ApplicationController
     #modify by nwb
     @flag = params[:flag] || false
     if @project
-      @boards = @project.boards.includes(:last_message => :author).all
-      @boards = [] << @boards[0] if @boards.any?
-      if @boards.size == 1
-        @board = @boards.first
-        show and return
+      if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+        render_403
+      else
+        @boards = @project.boards.includes(:last_message => :author).all
+        @boards = [] << @boards[0] if @boards.any?
+        if @boards.size == 1
+          @board = @boards.first
+          show and return
+        end
+        render :layout => false if request.xhr?
       end
-      render :layout => false if request.xhr?
     elsif @course
       if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
         @boards = @course.boards.includes(:last_message => :author).all
@@ -76,19 +80,19 @@ class BoardsController < ApplicationController
         if @project
           @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
           @topics =  @board.topics.
-              reorder("#{Message.table_name}.sticky DESC").
+              reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
               includes(:last_reply).
               limit(@topic_pages.per_page).
               offset(@topic_pages.offset).
-              order("last_replies_messages.created_on desc").
+
               preload(:author, {:last_reply => :author}).
               all
         elsif @course
-          board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC").
+          board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
               includes(:last_reply).
               # limit(@topic_pages.per_page).
               # offset(@topic_pages.offset).
-              order("last_replies_messages.created_on desc").
+
               preload(:author, {:last_reply => :author}).
               all : []
           @topics = paginateHelper board_topics,10

app/controllers/courses_controller.rb

@@ -342,10 +342,15 @@ class CoursesController < ApplicationController
 
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
+    filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
+    # 如果是ie11 需要转码
+    if(/rv\:11\.0/.match(request.env["HTTP_USER_AGENT"]) != nil)
+      filename= URI::encode(filename)
+    end
     respond_to do |format|
       format.xls {
         send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}.xls")
+                  :filename => "#{filename}.xls")
       }
     end
   end

app/controllers/files_controller.rb

@@ -23,7 +23,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,:search_project,:quote_resource_show_project,:search_tag_attachment]
+  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,:search_tag_attachment]
 
   helper :sort
   include SortHelper
@@ -46,6 +46,13 @@ class FilesController < ApplicationController
     @obj_attachments = paginateHelper @all_attachments,10
   end
 
+  def searchone4reload
+    attachment = Attachment.find_by_id(params[:fileid]);
+    respond_to do |format|
+      format.html{render :layout => nil,:locals=>{:file=>attachment,:course=>@course}}
+    end
+  end
+
   def search
     sort = ""
     @sort = ""
@@ -60,9 +67,7 @@ class FilesController < ApplicationController
       end
       sort = "#{@sort} #{@order}"
     end
-
     # show_attachments [@course]
-
     begin
       q = "%#{params[:name].strip}%"
       #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
@@ -101,14 +106,18 @@ class FilesController < ApplicationController
       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
+        if q == "%%"
+          @result = []
+          @searched_attach = paginateHelper @result,10
+        else
+          @result = find_public_attache q,sort
+          @result = visable_attachemnts_insite @result,@project
+          @searched_attach = paginateHelper @result,10
+        end
       else
         @result = find_project_attache q,@project,sort
         @result = visable_attachemnts @result

app/controllers/issues_controller.rb

@@ -84,15 +84,10 @@ class IssuesController < ApplicationController
       @issue_pages = Paginator.new @issue_count, @limit, params['page']
       @offset ||= @issue_pages.offset
       @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
-                              :order => sort_clause,
-                              :offset => @offset,
-                              :limit => @limit)
+                                :order => sort_clause,
+                                :offset => @offset,
+                                :limit => @limit)
       @issue_count_by_group = @query.issue_count_by_group
-
-
-
-
-
       respond_to do |format|
         format.js
         format.html { render :template => 'issues/index', :layout =>  @project_base_tag }#by young
@@ -131,11 +126,11 @@ class IssuesController < ApplicationController
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
     @priorities = IssuePriority.active
     @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
-    
+
     @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'#by young
     @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
-    
-    respond_to do |format|
+
+    respond_to do |format|``
       format.html {
         retrieve_previous_and_next_issue_ids
         render :template => 'issues/show', :layout => @project_base_tag#by young
@@ -174,7 +169,7 @@ class IssuesController < ApplicationController
             attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
             redirect_to new_project_issue_url(@issue.project, :issue => attrs)
           else
-            redirect_to issue_url(@issue)
+            redirect_to issue_url(@issue.id)
           end
         }
         format.api  { render :action => 'show', :status => :created, :location => issue_url(@issue) }
@@ -244,7 +239,8 @@ class IssuesController < ApplicationController
       flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
 
       respond_to do |format|
-        format.html { redirect_back_or_default issue_path(@issue) }
+
+        format.html { redirect_to issue_url(@issue.id) }
         format.api  { render_api_ok }
       end
     else

app/controllers/messages_controller.rb

@@ -193,7 +193,7 @@ class MessagesController < ApplicationController
       else
         redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id))
       end
-    elsif request.get?
+    elsif request.get? || request.post?
       if params[:is_board]
         if @project
           redirect_to project_boards_path(@project)

app/controllers/projects_controller.rb

@@ -31,7 +31,7 @@ class ProjectsController < ApplicationController
   before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
   before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
-  before_filter :file, :statistics, :watcherlist
+  before_filter :file, :statistics #:watcherlist
   # 除非项目内人员，不可查看成员, TODO: 完了写报表里去
   before_filter :memberAccess, only: :member
 
@@ -243,14 +243,7 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-    # params[:login]为邮箱邀请用户加入，主要功能：
-    # 1、自动注册
-    # 2、加入项目、创建角色
-    # 3、用户得分
-    if params[:email]
-      user = User.find_by_mail(params[:email].to_s)
-      Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id)
-    end
+
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
@@ -348,7 +341,7 @@ class ProjectsController < ApplicationController
     if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
       email = params[:mail]
       Mailer.run.send_invite_in_project(email, @project, User.current)
-      @is_zhuce =false
+      @is_zhuce = false
       flash[:notice] = l(:notice_email_sent, :value => email)
     elsif !User.find_by_mail(params[:mail].to_s).nil?
       user = User.find_by_mail(params[:mail].to_s)
@@ -399,6 +392,26 @@ class ProjectsController < ApplicationController
   # by young
   # include CoursesHelper
   def member
+    # params[:login]为邮箱邀请用户加入，主要功能：
+    # 1、自动注册
+    # 2、加入项目、创建角色
+    # 3、用户得分
+    if params[:mail]
+      user = User.find(params[:user_id])
+      user.activate!
+      Member.create(:role_ids => [4], :user_id => params[:user_id],:project_id => params[:id])
+      UserGrade.create(:user_id => params[:user_id], :project_id => params[:id])
+      token = Token.get_token_from_user(user, 'autologin')
+      #user = User.try_to_autologin(token.value)
+      if user
+        start_user_session(user)
+        user.save
+        redirect_to project_member_path(params[:id])
+        return
+        # account_ project_member_path(params[:id])
+        flash[:notice] = l(:label_mail_invite_success)
+      end
+    end
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'project_member_list'
     # 判断是否课程
@@ -417,10 +430,14 @@ class ProjectsController < ApplicationController
         @members = @project.member_principals.includes(:roles, :principal).all.sort
       end
     else
-      roles = Role.find_all_givable
-      @subPage_title = l :label_member_list
-      @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all
-      @applied_members = appied_project_members(@project, @members)
+      if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+        render_403
+      else
+        roles = Role.find_all_givable
+        @subPage_title = l :label_member_list
+        @members = @project.member_principals.includes(:roles, :principal).joins("LEFT JOIN #{OptionNumber.table_name} ON #{OptionNumber.table_name}.user_id = #{Member.table_name}.user_id and #{OptionNumber.table_name}.score_type = 2 AND #{Member.table_name}.project_id = #{OptionNumber.table_name}.project_id").order("#{OptionNumber.table_name}.total_score DESC").all
+        @applied_members = appied_project_members(@project, @members)
+      end
     end
     @members = paginateHelper @members
     render :layout => 'base_courses' if @project.project_type == 1
@@ -676,11 +693,13 @@ class ProjectsController < ApplicationController
     true
   end
 
-  # added by huang
-
   def watcherlist
-    if @watched
-       @users -= watched.watcher_users
+    unless @project.nil?
+      if !@project.is_public? && !User.current.member_of?(@project) && !User.current.admin?
+        render_403
+      else
+        @users -= watched.watcher_users if  @watched
+      end
     end
   end
 

app/controllers/test_controller.rb

@@ -1,3 +1,5 @@
+require 'net/http'
+
 class TestController < ApplicationController
   
   helper :UserScore
@@ -5,6 +7,10 @@ class TestController < ApplicationController
 
   def bootstrap; end
 
+  def view_office
+
+  end
+
   def zip
     homeworks_attach_path = []
     homework_id = params[:homework_id]

app/controllers/welcome_controller.rb

@@ -16,74 +16,77 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
+  # layout "base_welcome"
   include ApplicationHelper
   include WelcomeHelper
   helper :project_score
-  caches_action :robots
+  caches_action :robots, :course, :contest,  expires_in: 2.hours, layout: false
   #before_filter :find_first_page, :only => [:index]
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  
   def index
     # 企业版定制: params[:project]为传过来的参数
-    unless params[:organization].nil?
-      @organization = Organization.find params[:organization]
-      # @organization_projects = Project.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", @organization.id).order("score DESC").limit(10).all
-      @organization_projects = @organization.projects.visible.joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").order("project_scores.score DESC").limit(10).all
-      @part_projects = @organization_projects.count < 9 ? find_miracle_project( 9 - @organization_projects.count, 3,"score desc") : []
-      # @cur_projects = Project.find(params[:organization])
-      # @organization = @cur_projects.enterprise_name
-      # @organization_projects = (current_user.admin? || User.current.member_of?(@cur_projects)) ? Project.where("enterprise_name =? ", @organization) : Project.all_public.where("enterprise_name =? ", @organization)
-      # @e_count = @organization_projects.count
-      # @part_projects = []
-      # # 取十个
-      # @organization_projects.each do |obj|
-      #   break if(@organization_projects[10] == obj)
-      #   @part_projects << Project.visible.find_by_id("#{obj.id}") unless obj.id.nil?
-      # end
-      # # 不够十个的用最火项目替代
-      # @e_count < 9 ? @part_projects = find_miracle_project( 9 - @e_count, 3,"score desc") : @part_projects
-      # # 配置文件首页定制
-      @enterprise_page = FirstPage.find_by_page_type('enterprise')
-      if @enterprise_page.nil?
-        @enterprise_page = FirstPage.new
-        @enterprise_page.page_type = 'enterprise'
+
+      unless params[:organization].nil?
+        @organization = Organization.find params[:organization]
+        # @organization_projects = Project.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", @organization.id).order("score DESC").limit(10).all
+        @organization_projects = @organization.projects.visible.joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").order("project_scores.score DESC").limit(10).all
+        @part_projects = @organization_projects.count < 9 ? find_miracle_project( 9 - @organization_projects.count, 3,"score desc") : []
+        # @cur_projects = Project.find(params[:organization])
+        # @organization = @cur_projects.enterprise_name
+        # @organization_projects = (current_user.admin? || User.current.member_of?(@cur_projects)) ? Project.where("enterprise_name =? ", @organization) : Project.all_public.where("enterprise_name =? ", @organization)
+        # @e_count = @organization_projects.count
+        # @part_projects = []
+        # # 取十个
+        # @organization_projects.each do |obj|
+        #   break if(@organization_projects[10] == obj)
+        #   @part_projects << Project.visible.find_by_id("#{obj.id}") unless obj.id.nil?
+        # end
+        # # 不够十个的用最火项目替代
+        # @e_count < 9 ? @part_projects = find_miracle_project( 9 - @e_count, 3,"score desc") : @part_projects
+        # # 配置文件首页定制
+        @enterprise_page = FirstPage.find_by_page_type('enterprise')
+        if @enterprise_page.nil?
+          @enterprise_page = FirstPage.new
+          @enterprise_page.page_type = 'enterprise'
+        end
+        # 主页配置部分结束
       end
-      # 主页配置部分结束
-    end
-    # end 企业版定制结束
+      # end 企业版定制结束
 
-    if @first_page.nil? ||  @first_page.sort_type.nil?
-      @projects = find_miracle_project(10, 3,"score desc")
-    else
-      case @first_page.sort_type
-        when 0
-          @my_projects = find_my_projects
-          @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
-          @projects = find_miracle_project(10, 3,"created_on desc")
-          #@projects =  @projects_all.order("created_on desc")
-        when 1
-          @my_projects = find_my_projects
-          @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
-          @projects = find_miracle_project(10, 3,"score desc")
-          #@projects = @projects_all.order("grade desc")
-        when 2
-          @my_projects = find_my_projects
-          @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
-          @projects = find_miracle_project(10, 3,"watchers_count desc")
-          #@projects = @projects_all.order("watchers_count desc")
+      if @first_page.nil? ||  @first_page.sort_type.nil?
+        @projects = find_miracle_project(10, 3,"score desc")
+      else
+        case @first_page.sort_type
+          when 0
+            @my_projects = find_my_projects
+            @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
+            @projects = find_miracle_project(10, 3,"created_on desc")
+            #@projects =  @projects_all.order("created_on desc")
+          when 1
+            @my_projects = find_my_projects
+            @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
+            @projects = find_miracle_project(10, 3,"score desc")
+            #@projects = @projects_all.order("grade desc")
+          when 2
+            @my_projects = find_my_projects
+            @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
+            @projects = find_miracle_project(10, 3,"watchers_count desc")
+            #@projects = @projects_all.order("watchers_count desc")
 
-        #gcm
-        #when '3'
-        #@projects=desc_sort_course_by_avtivity(@project_activity_count_array,@project_all_array)
-        #  @projects=handle_project @projects_all,@project_activity_count
-        #  @s_type = 3
-        #  @projects =  @projects[@project_pages.offset, @project_pages.per_page]
+          #gcm
+          #when '3'
+          #@projects=desc_sort_course_by_avtivity(@project_activity_count_array,@project_all_array)
+          #  @projects=handle_project @projects_all,@project_activity_count
+          #  @s_type = 3
+          #  @projects =  @projects[@project_pages.offset, @project_pages.per_page]
 
-        else
-          @projects = @projects_all.order("score desc")
+          else
+            @projects = @projects_all.order("score desc")
+        end
       end
-    end
+
   rescue Exception => e
     render_404
   end

app/controllers/words_controller.rb

@@ -85,6 +85,9 @@ class WordsController < ApplicationController
     elsif @journal_destroyed.jour_type == "Course"
       @course = Course.find @journal_destroyed.jour_id
       @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
+    elsif @journal_destroyed.jour_type == "Principal"
+      @user = User.find(@journal_destroyed.jour_id)
+      @jours_count = @user.journals_for_messages.where('m_parent_id IS NULL').count
     end
     respond_to do |format|
       format.js

app/controllers/zipdown_controller.rb

@@ -9,10 +9,14 @@ class ZipdownController < ApplicationController
 
   #统一下载功能
   def download
-    begin
-      send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => params[:filename], :type => detect_content_type(params[:file])
-    rescue => e
-      render file: 'public/no_file_found.html'
+    if User.current.logged?
+      begin
+        send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => params[:filename], :type => detect_content_type(params[:file])
+      rescue => e
+        render file: 'public/no_file_found.html'
+      end
+    else
+      render_403
     end
   end
 

app/helpers/account_helper.rb

@@ -47,6 +47,18 @@ module AccountHelper
     user
   end
 
+  # 自动创建一个新用户，但是初始状态是锁定的
+  def automatically_register_lock(user, &block)
+    user.lock
+    user.last_login_on = Time.now
+    if user.save
+      UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
+    else
+      yield if block_given?
+    end
+    user
+  end
+
   def administrator_manually__register(user, &block)
     if user.save
       UserStatus.create(:user_id => user.id ,:changsets_count => 0, :watchers_count => 0)

app/helpers/application_helper.rb

@@ -622,8 +622,8 @@ module ApplicationHelper
   # 公开项目资源可以引用，admin和管理员和资源上传者拥有设置公开私有权限
   def authority_pubilic_for_files(project, file)
     @result = false
-    if (is_project_manager?(User.current.id, @project.id) || file.author_id == User.current.id || User.current.admin) &&
-        project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project"
+    if (is_project_manager?(User.current.id, @project.id) &&  User.current.allowed_to?(:manage_files, project)) || file.author_id == User.current.id || User.current.admin &&
+      project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project"
       @result = true
     end
     return @result

app/helpers/issues_helper.rb

@@ -67,29 +67,33 @@ module IssuesHelper
     s.html_safe
   end
 
-  #获取跟踪类型
-  #REDO:时间紧需要优化，两个方法可以综合成一个
+  #获取跟踪类型及样式
+  #REDO:时间紧可以优化.
   def get_issue_type(value)
+    issuetype = []
     if value == "缺陷" || value == 1
-      class_type = "red_btn_cir ml10"
+      issuetype << "red_btn_cir ml10"
+      issuetype << "缺陷"
     elsif value == "功能" || value == 2
-      class_type = "blue_btn_cir ml10"
+      issuetype << "blue_btn_cir ml10"
+      issuetype << "功能"
     elsif value == "支持" || value == 3
-      class_type = "green_btn_cir ml10"
+      issuetype << "green_btn_cir ml10"
+      issuetype << "支持"
+    elsif value == "任务" || value == 4
+      issuetype << "orange_btn_cir ml10"
+      issuetype << "任务"
     else
-      class_type = "orange_btn_cir ml10"
+      issuetype << "bgreen_btn_cir ml10"
+      issuetype << "周报"
     end
   end
 
-  def get_issue_typevalue(value)
-    if value == "缺陷" || value == 1
-      assign = "缺陷"
-    elsif value == "功能" || value == 2
-      assign = "功能"
-    elsif value == "支持" || value == 3
-      assign = "支持"
+  def principals_options_for_isuue_list(project)
+    if User.current.member_of?(project)
+      project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
     else
-      assign = "任务"
+      project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0])
     end
   end
 

app/helpers/projects_helper.rb

@@ -65,6 +65,16 @@ module ProjectsHelper
     content_tag('div', content, :class => "tabs")   
   end
 
+  # 判断我的项目中是否有重名项目
+  def judge_same_projectname(user, project_name)
+    result = false
+    my_projects = user.projects
+    my_projects.each do |mp|
+      result = true if mp.name == project_name
+    end
+    return result
+  end
+
   # Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},