From 77fed1ef13dc7e6ad33c6e92cacb97bdb92c4080 Mon Sep 17 00:00:00 2001
From: bohung
Date: Sun, 20 Sep 2020 17:21:07 +0800
Subject: [PATCH] Fix bug.
---
app/models/student_assignment.rb | 8 +++--
.../_form_assignment.html.erb | 33 ++++++++++---------
.../show_assignments.html.erb | 8 ++---
3 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/app/models/student_assignment.rb b/app/models/student_assignment.rb
index 5227cff..6dbd248 100644
--- a/app/models/student_assignment.rb
+++ b/app/models/student_assignment.rb
@@ -2,7 +2,7 @@ class StudentAssignment
include Mongoid::Document
include Mongoid::Timestamps
include Slug
- field :assignment_content, as: :slug_title, type: String, localize: true, default: ""
+ field :assignment_content, as: :slug_title, type: String, default: ""
has_many :student_assignment_files, :dependent => :destroy, :autosave => true
accepts_nested_attributes_for :student_assignment_files, :allow_destroy => true
belongs_to :course_assignment
@@ -14,6 +14,10 @@ class StudentAssignment
self.updated_at.strftime("%Y-%m-%d %H:%M")
end
def display_student_assignment_files
- self.student_assignment_files.map{|f| "#{f.title}"}.join("
").html_safe
+ self.student_assignment_files.map{ |f|
+ next if f.file.file.nil?
+ title = (f.title.blank? ? f.file.file.original_filename : f.title)
+ "#{title}"
+ }.join("
").html_safe
end
end
\ No newline at end of file
diff --git a/app/views/admin/selected_courses/_form_assignment.html.erb b/app/views/admin/selected_courses/_form_assignment.html.erb
index c165187..727b999 100644
--- a/app/views/admin/selected_courses/_form_assignment.html.erb
+++ b/app/views/admin/selected_courses/_form_assignment.html.erb
@@ -20,6 +20,9 @@
<% if @student_assignment.new_record? %>
<%= f.hidden_field :course_assignment_id,:value=>@course_assignment.id.to_s %>
<% end %>
+<% if params[:type] == "view" %>
+ <% @closed = true %>
+<% end %>
<% else %>
- <%= @student_assignment.send("display_"+file.pluralize) rescue "" %>
+ <%= @student_assignment.send("display_"+file.pluralize) %>
<% end %>
diff --git a/app/views/admin/selected_courses/show_assignments.html.erb b/app/views/admin/selected_courses/show_assignments.html.erb
index 4b1b4d3..17fd468 100644
--- a/app/views/admin/selected_courses/show_assignments.html.erb
+++ b/app/views/admin/selected_courses/show_assignments.html.erb
@@ -51,18 +51,18 @@
<% if !closed %>
<% if student_assignment.nil? %>
- - <%= link_to t('new_'), new_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page]) %>
+ - <%= link_to t('new_'), new_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page],:member_profile_name=>@member_profile.name, :member_profile_uid=>@member_profile.uid) %>
<% else %>
- - <%= link_to t('edit'), edit_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page],:id=>student_assignment.id) %>
+ - <%= link_to t('edit'), edit_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page],:id=>student_assignment.id,:member_profile_name=>@member_profile.name, :member_profile_uid=>@member_profile.uid) %>
<% end %>
<% else %>
<%=t('personal_selected_course.closed')%>
<% if student_assignment.nil? %>
- - <%= link_to t('personal_selected_course.view'), new_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page]) %>
+ - <%= link_to t('personal_selected_course.view'), new_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page],:member_profile_name=>@member_profile.name, :member_profile_uid=>@member_profile.uid) %>
<% else %>
- - <%= link_to t('personal_selected_course.view'), edit_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page],:id=>student_assignment.id) %>
+ - <%= link_to t('personal_selected_course.view'), edit_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page],:id=>student_assignment.id,:member_profile_name=>@member_profile.name, :member_profile_uid=>@member_profile.uid) %>
<% end %>
<% end %>