diff --git a/app/controllers/admin/selected_courses_controller.rb b/app/controllers/admin/selected_courses_controller.rb index dcc3093..f94024d 100644 --- a/app/controllers/admin/selected_courses_controller.rb +++ b/app/controllers/admin/selected_courses_controller.rb @@ -201,6 +201,8 @@ class Admin::SelectedCoursesController < OrbitMemberController end elsif( Course.find(course_assignment_params[:course_id]).member_profile_id.to_s == current_user.member_profile_id.to_s rescue false) return true + elsif( CourseAssignment.find(student_assignment_params[:course_assignment_id]).course.member_profile_id.to_s == current_user.member_profile_id.to_s rescue false) || (CourseAssignment.find(student_assignment_params[:course_assignment_id]).course.student_ids.include?(current_user.member_profile_id.to_s) rescue false) + return true else return false end diff --git a/app/models/selected_course.rb b/app/models/selected_course.rb index c341bdb..3112780 100644 --- a/app/models/selected_course.rb +++ b/app/models/selected_course.rb @@ -37,8 +37,7 @@ class SelectedCourse if course record.course_title = course.title record.year = course.year - record.course_objective = course.objective - if record.class.where(:course_id=>course.id,:member_profile_id=>record.member_profile_id).count != 0 + if record.class.where(:course_id=>course.id,:member_profile_id=>record.member_profile_id,:id.ne=>record.id).count != 0 false else if course && !course.student_ids.include?(record.member_profile_id.to_s) @@ -48,7 +47,7 @@ class SelectedCourse end end elsif( course.student_ids.include?(record.member_profile_id.to_s) rescue false) - false + true elsif course record.course_title = course.title record.year = course.year diff --git a/app/views/admin/selected_courses/_form_assignment.html.erb b/app/views/admin/selected_courses/_form_assignment.html.erb index 727b999..967cb88 100644 --- a/app/views/admin/selected_courses/_form_assignment.html.erb +++ b/app/views/admin/selected_courses/_form_assignment.html.erb @@ -36,7 +36,7 @@