qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1、解决非项目成员访问公开项目403问题 

2、去掉以前无用代码，解决对应调用问题
This commit is contained in:
huang 2015-06-25 10:11:01 +08:00
parent 5b2202de75
commit 777e3f6fad
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/git_usage_controller.rb
View File

@ -1,6 +1,6 @@
#added by baiyu #added by baiyu
class GitUsageController < ApplicationController class GitUsageController < ApplicationController
layout "project_base" layout "base_projects"
def ch_usage def ch_usage
end end

2
app/controllers/issue_categories_controller.rb
View File

@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class IssueCategoriesController < ApplicationController class IssueCategoriesController < ApplicationController
layout "project_base" layout "base_projects"
menu_item :settings menu_item :settings
model_object IssueCategory model_object IssueCategory
before_filter :find_model_object, :except => [:index, :new, :create] before_filter :find_model_object, :except => [:index, :new, :create]

2
app/controllers/organization_controller.rb
View File

@ -1,5 +1,5 @@
class OrganizationController < ApplicationController class OrganizationController < ApplicationController
layout 'project_base' layout 'base_projects'
before_filter :require_admin, :except => [:index] before_filter :require_admin, :except => [:index]
def index def index

16
app/controllers/projects_controller.rb
View File

@ -438,9 +438,9 @@ class ProjectsController < ApplicationController
case params[:role] case params[:role]
when '1' when '1'
@subPage_title = l :label_teacher_list @subPage_title = l :label_teacher_list
@members = searchTeacherAndAssistant(@project) @members = searchTeacherAndAssistant(@project)
when '2' when '2'
@subPage_title = l :label_student_list @subPage_title = l :label_student_list
@members = searchStudent(@project) @members = searchStudent(@project)
else else
@subPage_title = '' @subPage_title = ''
@ -578,7 +578,7 @@ class ProjectsController < ApplicationController
format.api { render_api_ok } format.api { render_api_ok }
end end
else else
render :layout => "project_base" render :layout => "base_projects"
end end
# hide project in layout # hide project in layout
@project = nil @project = nil
@ -586,7 +586,7 @@ class ProjectsController < ApplicationController
def show_projects_score def show_projects_score
respond_to do |format| respond_to do |format|
format.html { render :layout => "project_base"} format.html { render :layout => "base_projects"}
format.js format.js
end end
end end
@ -674,10 +674,10 @@ class ProjectsController < ApplicationController
private private
def memberAccess def memberAccess
# 是课程，则判断当前用户是否参加了课程 # 如果是私有项目，项目成员不对外公开，公开项目成员列表对外公开。
# return 0 if @project.project_type == Project::ProjectType_project unless @project.is_public?
# currentUser = User.current render_403 unless User.current.member_of?(@project)
render_403 unless User.current.member_of?(@project) end
end end
def toggleCourse def toggleCourse

2
plugins/redmine_code_review/app/controllers/code_review_controller.rb
View File

@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class CodeReviewController < ApplicationController class CodeReviewController < ApplicationController
layout "project_base" layout "base_projects"
unloadable unloadable
before_filter :find_project, :authorize, :find_user, :find_setting, :find_repository before_filter :find_project, :authorize, :find_user, :find_setting, :find_repository