添加引用项目权限、修改引用判断
This commit is contained in:
parent
5f18b1a38c
commit
5e3a763776
|
@ -375,11 +375,14 @@ class BidsController < ApplicationController
|
||||||
@option = []
|
@option = []
|
||||||
@membership.each do |membership|
|
@membership.each do |membership|
|
||||||
unless(membership.project.project_type==1)
|
unless(membership.project.project_type==1)
|
||||||
membership.member_roles.each{|role|
|
if membership.user.allowed_to?(:quote_project,membership.project)
|
||||||
if(role.role_id == 3)
|
@option << membership.project
|
||||||
@option << membership.project
|
end
|
||||||
end
|
#membership.member_roles.each{|role|
|
||||||
}
|
# if(role.role_id == 3)
|
||||||
|
# @option << membership.project
|
||||||
|
# end
|
||||||
|
#}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -454,14 +457,14 @@ class BidsController < ApplicationController
|
||||||
if (User.current.logged? && User.current.member_of_course?(@bid.courses.first))
|
if (User.current.logged? && User.current.member_of_course?(@bid.courses.first))
|
||||||
# flash[:notice] = ""
|
# flash[:notice] = ""
|
||||||
@membership = User.current.coursememberships.all(:conditions => Course.visible_condition(User.current))
|
@membership = User.current.coursememberships.all(:conditions => Course.visible_condition(User.current))
|
||||||
@option = []
|
#@option = []
|
||||||
@membership.each do |membership|
|
#@membership.each do |membership|
|
||||||
membership.member_roles.each{|role|
|
# membership.member_roles.each{|role|
|
||||||
if(role.role_id == 3)
|
# if(role.role_id == 3)
|
||||||
@option << membership.course
|
# @option << membership.course
|
||||||
end
|
# end
|
||||||
}
|
# }
|
||||||
end
|
#end
|
||||||
|
|
||||||
@user = @bid.author
|
@user = @bid.author
|
||||||
@bidding_project = @bid.biding_projects.all
|
@bidding_project = @bid.biding_projects.all
|
||||||
|
@ -990,7 +993,7 @@ class BidsController < ApplicationController
|
||||||
return true if current_user.admin?
|
return true if current_user.admin?
|
||||||
#return 0 if @bid.courses.first.project_type == Project::ProjectType_project
|
#return 0 if @bid.courses.first.project_type == Project::ProjectType_project
|
||||||
currentUser = User.current
|
currentUser = User.current
|
||||||
render_403 unless currentUser.member_of_cousrse?(@bid.courses.first)
|
render_403 unless currentUser.member_of_course?(@bid.courses.first)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
class AddQuateProjectPermission < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
# 添加课程权限
|
||||||
|
Role.all.each do |role|
|
||||||
|
if role.name == 'Manager'
|
||||||
|
role.permissions.append(:quote_project)
|
||||||
|
role.save(:validate => false)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# It's strongly recommended to check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20140704034832) do
|
ActiveRecord::Schema.define(:version => 20140707095213) do
|
||||||
|
|
||||||
create_table "activities", :force => true do |t|
|
create_table "activities", :force => true do |t|
|
||||||
t.integer "act_id", :null => false
|
t.integer "act_id", :null => false
|
||||||
|
|
|
@ -98,6 +98,7 @@ Redmine::AccessControl.map do |map|
|
||||||
map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
|
map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
|
||||||
map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
|
map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
|
||||||
map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true
|
map.permission :view_journals_for_messages, {:gantts => [:show, :update]}, :read => true
|
||||||
|
map.permission :quote_project, {},:require => :member
|
||||||
|
|
||||||
#课程权限模块
|
#课程权限模块
|
||||||
#added by nwb
|
#added by nwb
|
||||||
|
|
Loading…
Reference in New Issue