From b0f0f74430d647643f16c71c5d49ae76e27a9f27 Mon Sep 17 00:00:00 2001
From: bohung <bohung@rulingcom.com>
Date: Mon, 21 Sep 2020 23:29:05 +0800
Subject: [PATCH] Fix bug.

---
 app/controllers/admin/selected_courses_controller.rb       | 2 ++
 app/models/selected_course.rb                              | 5 ++---
 app/views/admin/selected_courses/_form_assignment.html.erb | 2 +-
 app/views/admin/selected_courses/show_assignments.html.erb | 2 +-
 config/locales/en.yml                                      | 2 +-
 config/locales/zh_tw.yml                                   | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

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 @@
     <div class="control-group input-title">
       <label class="control-label muted"><%= t("personal_course.detail") %></label>
       <div class="controls">
-        <%= @course_assignment.detail %>
+        <%= @course_assignment.detail.html_safe %>
       </div>
     </div>
     <!-- Attachment -->
diff --git a/app/views/admin/selected_courses/show_assignments.html.erb b/app/views/admin/selected_courses/show_assignments.html.erb
index 17fd468..23348e0 100644
--- a/app/views/admin/selected_courses/show_assignments.html.erb
+++ b/app/views/admin/selected_courses/show_assignments.html.erb
@@ -68,7 +68,7 @@
                         <% end %>
                     </div>
                 </td>
-                <td><%= course_assignment.detail %></td>
+                <td><%= course_assignment.detail.html_safe %></td>
                 <td><%= course_assignment.display_attachments %></td>
                 <td><%= course_assignment.display_assign_date %></td>
                 <td><%= course_assignment.display_deadline %></td>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cad5ccb..20277a0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -21,7 +21,7 @@ en:
     year: Year
     course_title: Course Title
     course_url: Course URL
-    course_objective: Course Objective
+    course_objective: Learning Objective
     selected_course_semester: Semester
     selected_course_category: Category
     selected_course_syllabus_file: Syllabus Files
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 7a6cf3d..211a4fe 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -21,7 +21,7 @@ zh_tw:
     year: 年度
     course_title: 課程名稱
     course_url: 課程網址
-    course_objective: 課程目標
+    course_objective: 學習目標
     selected_course_category: 課程類別
     selected_course_semester: 學期
     selected_course_syllabus_file: 教學大綱