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

Conflicts:
	app/views/layouts/base_projects.html.erb
	app/views/users/show.html.erb
	config/locales/zh.yml

.gitignore

@@ -21,3 +21,4 @@
 .rbenv-gemsets
 .DS_Store
 public/api_doc/
+/.metadata

Gemfile

@@ -21,7 +21,8 @@ gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
 #gem 'email_verifier', path: 'lib/email_verifier'
-
+gem 'rufus-scheduler'
+#gem 'dalli', path: 'lib/dalli-2.7.2'
 group :development do
   gem 'grape-swagger'
   gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'

app/api/mobile/apis/comments.rb

@@ -72,6 +72,31 @@ module Mobile
           present :status, 0
         end
 
+        desc ' 意见反馈'
+        params do
+          requires :token, type: String
+          requires :subject,type: String,desc: '意见'
+        end
+        post do
+          cs_params = {
+              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?
+          present :status, 0
+        end
+
+        desc '课程留言列表'
+        params do
+          optional :token, type: String
+        end
+        get ':id/course_message' do
+          cs = CommentService.new
+          jours = cs.course_messages params,(current_user.nil? ? User.find(2):current_user)
+          present :data, jours, with: Mobile::Entities::Jours
+          present :status, 0
+        end
 
       end
     end

app/api/mobile/apis/courses.rb

@@ -8,10 +8,11 @@ module Mobile
           optional :school_id, type: Integer, desc: '传入学校id,返回该学校课程列表'
           requires :per_page_count, type: Integer, desc: '每页总数'
           requires :page, type: Integer, desc: '当前页码'
+          optional :token, type: String
         end
         get do
           cs = CoursesService.new
-          courses = cs.course_list(params)
+          courses = cs.course_list(params,current_user.nil? ? User.find(2):current_user)
           present :data, courses, with: Mobile::Entities::Course
           present :status, 0
         end
@@ -130,10 +131,11 @@ module Mobile
         desc "搜索课程"
         params do
           requires :name, type: String, desc: "课程名"
+          optional :token, type: String
         end
         get 'search' do
           cs = CoursesService.new
-          courses = cs.search_course(params)
+          courses = cs.search_course(params,current_user.nil? ? User.find(2):current_user)
           present :data, courses, with: Mobile::Entities::Course
           present :status, 0
         end
@@ -165,13 +167,15 @@ module Mobile
         desc "返回单个课程"
         params do
           requires :id, type: Integer
+          optional :token, type: String
         end
         route_param :id do
           get do
             cs = CoursesService.new
             course = cs.show_course(params,(current_user.nil? ? User.find(2):current_user))
             #course = Course.find(params[:id])
-            {status: 0, data: course}
+            present :data, course, with: Mobile::Entities::Course
+            present :status, 0
           end
         end
 
@@ -209,7 +213,7 @@ module Mobile
           present :status, 0
         end
 
-        desc '课程动态'
+        desc '用户课程动态'
         params do
           requires :token, type: String
         end

app/api/mobile/entities/anonymous_works_params.rb

@@ -15,6 +15,7 @@ module Mobile
       anonymous_works_params_expose :m_score
       anonymous_works_params_expose :is_anonymous_comments
       anonymous_works_params_expose :cur_type
+      anonymous_works_params_expose :cur_page
       expose :jours ,using: Mobile::Entities::Jours do |f, opt|
         if f.is_a?(Hash) && f.key?(:jours)
           f[:jours]

app/api/mobile/entities/course.rb

@@ -1,6 +1,7 @@
 module Mobile
   module Entities
     class Course < Grape::Entity
+      include Redmine::I18n
       def self.course_expose(field)
         expose field do |f,opt|
           c = nil
@@ -9,9 +10,11 @@ module Mobile
           else
             c = f[:course]
           end
-          if field == :img_url
+          if f.is_a?(Hash) && f.key?(field)
             f[field] if f.is_a?(Hash) && f.key?(field)
             #f.img_url if f.respond_to?(:img_url)
+          elsif field == :created_at || field == :updated_at
+            (format_time(c[field]) if (c.is_a?(Hash) && c.key?(field))) || (format_time(c.send(field)) if c.respond_to?(field))
           else
             (c[field] if (c.is_a?(Hash) && c.key?(field))) || (c.send(field) if c.respond_to?(field))
           end
@@ -50,9 +53,11 @@ module Mobile
           c[:course].teacher
         end
       end
-      expose :my_homework,using: Mobile::Entities::HomeworkAttach  do |f, opt|
+      expose :my_homework,using: Mobile::Entities::Homework  do |f, opt|
         f[:my_homework] if f.is_a?(Hash) && f.key?(:my_homework)
       end
+      course_expose :current_user_is_member
+      course_expose :current_user_is_teacher
     end
   end
 end

app/api/mobile/entities/course_dynamic.rb

@@ -1,17 +1,24 @@
 module Mobile
   module Entities
     class CourseDynamic < Grape::Entity
+      include Redmine::I18n
       def self.course_dynamic_expose(field)
         expose field do |c,opt|
-          c[field] if (c.is_a?(Hash) && c.key?(field))
+          if field == :update_time
+            (format_time(c[field]) if (c.is_a?(Hash) && c.key?(field)))
+          else
+            c[field] if (c.is_a?(Hash) && c.key?(field))
+          end
+
         end
       end
-
+      course_dynamic_expose :type
+      course_dynamic_expose :count
       course_dynamic_expose :course_name
-      course_dynamic_expose :need_anonymous_comments_count
-      course_dynamic_expose :student_commit_number
-      course_dynamic_expose :news_count
-      course_dynamic_expose :message_count
+      course_dynamic_expose :course_id
+      course_dynamic_expose :course_img_url
+      course_dynamic_expose :message
+      course_dynamic_expose :update_time
     end
   end
 end

app/api/mobile/entities/homework.rb

@@ -1,10 +1,15 @@
 module Mobile
   module Entities
     class Homework < Grape::Entity
+      include Redmine::I18n
       def self.homework_expose(field)
         expose field do |f,opt|
           if f.is_a?(Hash) && f.key?(field)
-            f[field]
+            if field == :created_on
+              format_time(f[field])
+            else
+              f[field]
+            end
           elsif f.is_a?(::Bid)
             if f.respond_to?(field)
               f.send(field)
@@ -18,8 +23,16 @@ module Mobile
       homework_expose :id
       #课程名称
       homework_expose :course_name
-      #课程老师
-      homework_expose :course_teacher
+
+      homework_expose :course_id
+      #作业发布者
+      expose :author,using: Mobile::Entities::User  do |f, opt|
+         f[:author]
+      end
+
+      #作业发布者真名
+      homework_expose :author_real_name
+
       #作业次数
       homework_expose :homework_times
       #作业名称
@@ -36,6 +49,13 @@ module Mobile
       #只有作业启用了匿评功能且当前用户是课程老师且已提交的作品数量大于或等于2才能开启匿评
       homework_expose :homework_state
 
+      homework_expose :created_on
+      homework_expose :deadline
+
+      expose :jours,using: Mobile::Entities::Jours  do |f, opt|
+        f[:jours] if f.is_a?(Hash) && f.key?(:jours)
+      end
+
       expose :homework_for_anonymous_comments,using: Mobile::Entities::HomeworkAttach  do |f, opt|
         f[:homework_for_anonymous_comments] if f.is_a?(Hash) && f.key?(:homework_for_anonymous_comments)
       end

app/api/mobile/entities/homework_jours.rb

@@ -6,7 +6,11 @@ module Mobile
       def self.homework_jours_expose(field)
         expose field do |f,opt|
           if f.is_a?(Hash) && f.key?(field)
-            f[field]
+            if field == :created_at
+              format_time(f[field])
+            else
+              f[field]
+            end
           elsif f.is_a?(::SeemsRateableRates)
 
           end

app/api/mobile/entities/news.rb

@@ -1,6 +1,7 @@
 module Mobile
   module Entities
     class News < Grape::Entity
+      include Redmine::I18n
       def self.news_expose(field)
         expose field do |f,opt|
           if f.is_a?(Hash) && f.key?(field)
@@ -9,13 +10,18 @@ module Mobile
             n = f[:news]
             comments = f[:comments]
             if n.is_a?(::News)
-              n.send(field) if n.respond_to?(field)
+              if field == :created_on
+                format_time(n.send(field)) if n.respond_to?(field)
+              else
+                n.send(field) if n.respond_to?(field)
+              end
+
             end
 
           end
         end
       end
-
+      news_expose :id
       #新闻标题
       news_expose :title
 

app/controllers/account_controller.rb

@@ -125,7 +125,7 @@ class AccountController < ApplicationController
           #register_by_email_activation(@user)
           unless @user.new_record?
             flash[:notice] = l(:notice_account_register_done)
-            render action: 'email_valid', locals: {:mail => user.mail}
+            render action: 'email_valid', locals: {:mail => @user.mail}
           end
         when '3'
           #register_automatically(@user)
@@ -315,7 +315,7 @@ class AccountController < ApplicationController
     code = /\d*/
     #根据home_url生产正则表达式
     eval("code = " + "/^" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index\\\/*.*)?\$/")
-    if code=~params[:back_url] && last_login_on != ''
+    if (code=~params[:back_url] || params[:back_url].to_s.include?('lost_password')) && last_login_on != ''
       redirect_to user_activities_path(user)
     else
       if last_login_on == ''

app/controllers/admin_controller.rb

@@ -322,4 +322,22 @@ class AdminController < ApplicationController
     end
   end
 
+  #组织
+  def organization
+    @organizations = Organization.all
+    respond_to do |format|
+      format.html
+    end
+  end
+  #移动端版本管理
+  def mobile_version
+    @versions = PhoneAppVersion.reorder('created_at desc')
+    @new_version = PhoneAppVersion.new
+
+  end
+
+  def create_version
+
+  end
+
 end

app/controllers/application_controller.rb

@@ -177,6 +177,22 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def logged_user_by_apptoken
+    #从手机端传来apptoken则将当前登陆用户变为对应的用户
+    if params[:apptoken]
+      token = ApiKey.where(access_token: params[:apptoken]).first
+      if token && !token.expired?
+        @current_user = User.find(token.user_id)
+      end
+      unless @current_user.nil?
+        self.logged_user = @current_user
+        if @current_user
+          @current_user.update_column(:last_login_on, Time.now)
+        end
+      end
+    end
+  end
+
   # Logs out current user
   def logout_user
     if User.current.logged?

app/controllers/attachments_controller.rb

@@ -186,6 +186,10 @@ class AttachmentsController < ApplicationController
 
     @attachment = Attachment.new(:file => request.raw_post)
     @attachment.author = User.current
+    if !params[:project].nil?
+      @attachment.container_type = 'Project'
+      @attachment.container_id = params[:project].split("?")[0]
+    end
     @attachment.filename = params[:filename].presence || Redmine::Utils.random_hex(16)
     saved = @attachment.save
 

app/controllers/bids_controller.rb

@@ -9,7 +9,7 @@ class BidsController < ApplicationController
   menu_item :homework_statistics, :only => :homework_statistics
   menu_item :edit, :only => :edit
 
-
+  before_filter :auth_login1, :only => [:show_courseEx]
 
   before_filter :can_show_course,only: []
   before_filter :can_show_contest,only: []

app/controllers/boards_controller.rb

@@ -57,6 +57,7 @@ class BoardsController < ApplicationController
 
   def show  
     respond_to do |format|
+      format.js
       format.html {
         sort_init 'updated_on', 'desc'
         sort_update 'created_on' => "#{Message.table_name}.created_on",

app/controllers/courses_controller.rb

@@ -5,6 +5,7 @@ class CoursesController < ApplicationController
   helper :members
   helper :words
 
+  before_filter :auth_login1, :only => [:show, :feedback]
   menu_item :overview
   menu_item :feedback, :only => :feedback
   menu_item :homework, :only => :homework
@@ -16,6 +17,7 @@ class CoursesController < ApplicationController
   menu_item l(:label_sort_by_influence), :only => :index
 
   before_filter :can_show_course, :except => []
+  before_filter :logged_user_by_apptoken,:only => [:show,:new_homework,:feedback]
   before_filter :find_course, :except => [ :index, :search,:list, :new,:join,:unjoin, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_private_courses]
   before_filter :authorize_course, :only => [:show, :settings, :edit, :update, :modules, :close, :reopen, :view_homework_attaches, :course]
   before_filter :authorize_course_global, :only => [:view_homework_attaches, :new,:create]
@@ -98,7 +100,8 @@ class CoursesController < ApplicationController
   #更新课程信息
   def update
     cs = CoursesService.new
-    @course = cs.edit_course params,@course,User.current
+    c = cs.edit_course params,@course,User.current
+    @course = c[:course]
     if @course.errors.full_messages.count <= 0
         respond_to do |format|
           format.html {
@@ -498,7 +501,7 @@ class CoursesController < ApplicationController
 
   def create
     cs = CoursesService.new
-    @course = cs.create_course params,User.current
+    @course = cs.create_course(params,User.current)[:course]
     if @course.new_record?
       respond_to do |format|
         format.html { render :action => 'new', :layout => 'base' } #Added by young
@@ -955,10 +958,34 @@ class CoursesController < ApplicationController
     else
       render_403
     end
-
   end
 
-
+  #根据已有课程复制课程
+  #param id:已有课程ID
+  def copy_course
+    if @course
+      @new_course = Course.new @course.attributes
+      @new_course.tea_id = User.current.id
+      @new_course.created_at = DateTime.now
+      @new_course.updated_at = DateTime.now
+      @new_course.endup_time = nil
+      if @new_course.save
+        r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
+        m = Member.new(:user => User.current, :roles => [r])
+        m.project_id = -1
+        course = CourseInfos.new(:user_id => User.current.id, :course_id => @new_course.id)
+        #user_grades = UserGrade.create(:user_id => User.current.id, :course_id => @course.id)
+        if @new_course.is_public == 1
+          course_status = CourseStatus.create(:course_id => @new_course.id, :watchers_count => 0, :changesets_count => 0, :grade => 0, :course_type => 1)
+        end
+        @new_course.members << m
+        @new_course.course_infos << course
+        redirect_to settings_course_url @new_course
+      end
+    else
+      render_404
+    end
+  end
 
   private
 

app/controllers/documents_controller.rb

@@ -61,6 +61,10 @@ class DocumentsController < ApplicationController
     if @project.project_type ==1
           render :action => 'show', :layout => 'base_courses'
     end
+    respond_to do |format|
+      format.html
+      format.api
+    end
   end
 
   def new

app/controllers/files_controller.rb

@@ -20,7 +20,7 @@ class FilesController < ApplicationController
     layout 'base_projects' #by young
 
   menu_item :files
-
+  before_filter :auth_login1, :only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search]
 
@@ -148,7 +148,11 @@ class FilesController < ApplicationController
 
       show_attachments @containers
 
-      render :layout => !request.xhr?
+
+      respond_to do |format|
+        format.html
+        format.js
+      end
     elsif params[:course_id]
       @isproject = false
 

app/controllers/forums_controller.rb

@@ -15,12 +15,14 @@ class ForumsController < ApplicationController
   PageLimit = 20
   def create_feedback
     if User.current.logged?
-      @memo = Memo.new(params[:memo])
-      @memo.forum_id = "1"
-      @memo.author_id = User.current.id
+      #@memo = Memo.new(params[:memo])
+      #@memo.forum_id = "1"
+      #@memo.author_id = User.current.id
       #@forum = @memo.forum
+      cs = CommentService.new
+      @memo = cs.create_feedback params,User.current
       respond_to do |format|
-        if @memo.save
+        if !@memo.new_record?
           format.html { redirect_to forum_path(@memo.forum) }
         else
           sort_init 'updated_at', 'desc'

app/controllers/homework_attach_controller.rb

@@ -6,7 +6,7 @@ class HomeworkAttachController < ApplicationController
   ###############################
   before_filter :can_show_course,except: []
   #判断当前角色权限时需先找到当前操作的project
-  before_filter :find_course_by_bid_id, :only => [:new]
+  before_filter :logged_user_by_apptoken,:find_course_by_bid_id, :only => [:new]
   before_filter :find_bid_and_course,:only => [:get_not_batch_homework,:get_batch_homeworks,:get_homeworks,:get_homework_jours, :get_student_batch_homework, :get_my_homework]
   before_filter :find_course_by_hoemwork_id, :only => [:edit,:update,:destroy,:show,:add_homework_users,:destory_homework_users, :praise_homework]
   #判断当前角色是否有操作权限

app/controllers/issues_controller.rb

@@ -90,6 +90,7 @@ class IssuesController < ApplicationController
 
 
       respond_to do |format|
+        format.js
         format.html { render :template => 'issues/index', :layout =>  @project_base_tag }#by young
         format.api  {
           Issue.load_visible_relations(@issues) if include_in_api_response?('relations')
@@ -103,6 +104,7 @@ class IssuesController < ApplicationController
         format.html { render(:template => 'issues/index', :layout =>  @project_base_tag) }#by young
         format.any(:atom, :csv, :pdf) { render(:nothing => true) }
         format.api { render_validation_errors(@query) }
+        format.js
       end
     end
   rescue ActiveRecord::RecordNotFound
@@ -153,6 +155,8 @@ class IssuesController < ApplicationController
   def create
     call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
     @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
+    # 给该issue在它所在的项目中所有的issues中所在的位置给一个序号
+    @issue.project_issues_index = @issue.project.issues.last.nil? ? 1 : @issue.project.issues.last.project_issues_index + 1
     if @issue.save
       call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
       respond_to do |format|

app/controllers/messages_controller.rb

@@ -17,6 +17,7 @@
 
 class MessagesController < ApplicationController
   include ApplicationHelper
+  before_filter :authorize1, :only => [:show]
   menu_item :boards
   default_search_scope :messages
   before_filter :find_board, :only => [:new, :preview,:edit]

app/controllers/news_controller.rb

@@ -17,6 +17,7 @@
 
 class NewsController < ApplicationController
   layout 'base_projects'# by young
+  before_filter :authorize1, :only => [:show]
   default_search_scope :news
   model_object News
   before_filter :find_model_object, :except => [:new, :create, :index]