|
|
|
|
@ -31,16 +31,14 @@ class ProjectsController < ApplicationController
|
|
|
|
|
menu_item :feedback, :only => :feedback
|
|
|
|
|
menu_item l(:label_course_file), :only => :index
|
|
|
|
|
menu_item l(:label_course_news), :only => :index
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# edit
|
|
|
|
|
before_filter :authorize1, :only => [:show]
|
|
|
|
|
#
|
|
|
|
|
before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_project]
|
|
|
|
|
# before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file,
|
|
|
|
|
# :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
|
|
|
|
|
# :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
|
|
|
|
|
#此条勿删 课程相关权限 ,:new_homework,:homework,:feedback,,:member
|
|
|
|
|
before_filter :authorize, :only => [:settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
|
|
|
|
|
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
|
|
|
|
|
@ -118,8 +116,8 @@ class ProjectsController < ApplicationController
|
|
|
|
|
joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id").joins("LEFT JOIN #{ProjectScore.table_name} ON #{Project.table_name}.id = #{ProjectScore.table_name}.project_id").
|
|
|
|
|
where("#{Project.table_name}.project_type = ? ", Project::ProjectType_project)
|
|
|
|
|
|
|
|
|
|
@poll_questions_count = @projects_all.count
|
|
|
|
|
@poll_questions_pages = Paginator.new @project_count, per_page_option, params['page']
|
|
|
|
|
@project_count = @projects_all.count
|
|
|
|
|
@project_pages = Paginator.new @project_count, per_page_option, params['page']
|
|
|
|
|
|
|
|
|
|
#gcm activity count
|
|
|
|
|
|
|
|
|
|
@ -558,11 +556,6 @@ class ProjectsController < ApplicationController
|
|
|
|
|
|
|
|
|
|
# Show @project
|
|
|
|
|
def show
|
|
|
|
|
if(@project && !@project.is_public && !User.current.member_of?(@project))
|
|
|
|
|
render_403
|
|
|
|
|
return
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
@project_type = params[:project_type]
|
|
|
|
|
|
|
|
|
|
# try to redirect to the requested menu item
|
|
|
|
|
@ -594,7 +587,7 @@ class ProjectsController < ApplicationController
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
has = {
|
|
|
|
|
"show_issues" => true,
|
|
|
|
|
"show_issues" => true ,
|
|
|
|
|
"show_files" => true,
|
|
|
|
|
"show_documents" => true,
|
|
|
|
|
"show_messages" => true,
|
|
|
|
|
@ -604,8 +597,8 @@ class ProjectsController < ApplicationController
|
|
|
|
|
"show_wiki_edits"=>true,
|
|
|
|
|
"show_journals_for_messages" => true
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@date_to ||= Date.today + 1
|
|
|
|
|
@date_from = @date_to - @days#-1.years #modified by lizanle 去掉這個1年的時間跨度
|
|
|
|
|
@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
|
|
|
|
|
@author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
|
|
|
|
|
# 决定显示所用用户或单个用户活动
|
|
|
|
|
@ -619,9 +612,9 @@ class ProjectsController < ApplicationController
|
|
|
|
|
# modify by nwb
|
|
|
|
|
# 添加私密性判断
|
|
|
|
|
if User.current.member_of?(@project)|| User.current.admin?
|
|
|
|
|
events = @activity.events(@days)
|
|
|
|
|
events = @activity.events(@date_from, @date_to)
|
|
|
|
|
else
|
|
|
|
|
events = @activity.events(@days,nil, :is_public => 1)
|
|
|
|
|
events = @activity.events(@date_from, @date_to, :is_public => 1)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
@offset, @limit = api_offset_and_limit({:limit => 10})
|
|
|
|
|
|
