diff --git a/app/helpers/bids_helper.rb b/app/helpers/bids_helper.rb index a41867c64..a5c25ecb5 100644 --- a/app/helpers/bids_helper.rb +++ b/app/helpers/bids_helper.rb @@ -155,27 +155,6 @@ module BidsHelper end people.include?(User.current) end - #当前用户是不是指定课程的学生 - def is_cur_course_student? course - #people = [] - #course.members.includes(:user, :roles).each do |member| - # if [5,10].include? member.roles.first.id - # people << member.user - # end - #end - #people.include?(User.current) - #修改:能新建占位且不能新建任务的角色判定为学生 - is_student = false - @membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current)) - @membership.each do |membership| - unless(membership.project.project_type==0) - if !User.current.allowed_to?({:controller => "projects", :action => "new_homework"}, membership.project, :global => false) && User.current.allowed_to?({:controller => "homework_attach", :action => "new"}, membership.project, :global => false) - is_student = true - end - end - end - is_student - end # def select_option_helper option # tmp = Hash.new diff --git a/app/views/homework_attach/_homework_member.html.erb b/app/views/homework_attach/_homework_member.html.erb index c8e3bfbd2..9dfe170bd 100644 --- a/app/views/homework_attach/_homework_member.html.erb +++ b/app/views/homework_attach/_homework_member.html.erb @@ -20,7 +20,7 @@
<%= notice %>
@@ -23,7 +23,16 @@