Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
This commit is contained in:
commit
442be21a30
|
@ -86,6 +86,18 @@ class UsersController < ApplicationController
|
||||||
helper :issues
|
helper :issues
|
||||||
include UsersHelper
|
include UsersHelper
|
||||||
|
|
||||||
|
# 获取我的任务
|
||||||
|
# order 排序条件
|
||||||
|
def user_issues
|
||||||
|
# Issues = Issue.visible.open.where("assigned_to_id = #{assigned_to_id} or author_id = #{User.current.id} er_course_ids.join(',')}) and container_type = 'Course')"+
|
||||||
|
# "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
|
||||||
|
# and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
|
||||||
|
#
|
||||||
|
# @issues = @Issues= Issue.visible.open.
|
||||||
|
# where(:assigned_to_id => User.current.id)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
#展开所有回复
|
#展开所有回复
|
||||||
def show_all_replies
|
def show_all_replies
|
||||||
case params[:type]
|
case params[:type]
|
||||||
|
|
Loading…
Reference in New Issue