Fix bug.
This commit is contained in:
parent
08e062e0ab
commit
77fed1ef13
|
@ -2,7 +2,7 @@ class StudentAssignment
|
||||||
include Mongoid::Document
|
include Mongoid::Document
|
||||||
include Mongoid::Timestamps
|
include Mongoid::Timestamps
|
||||||
include Slug
|
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
|
has_many :student_assignment_files, :dependent => :destroy, :autosave => true
|
||||||
accepts_nested_attributes_for :student_assignment_files, :allow_destroy => true
|
accepts_nested_attributes_for :student_assignment_files, :allow_destroy => true
|
||||||
belongs_to :course_assignment
|
belongs_to :course_assignment
|
||||||
|
@ -14,6 +14,10 @@ class StudentAssignment
|
||||||
self.updated_at.strftime("%Y-%m-%d %H:%M")
|
self.updated_at.strftime("%Y-%m-%d %H:%M")
|
||||||
end
|
end
|
||||||
def display_student_assignment_files
|
def display_student_assignment_files
|
||||||
self.student_assignment_files.map{|f| "<a href=\"#{f.file.url}\" title=\"#{f.title}\">#{f.title}</a>"}.join("<br>").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)
|
||||||
|
"<a href=\"#{f.file.url}\" title=\"#{title}\">#{title}</a>"
|
||||||
|
}.join("<br>").html_safe
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -20,6 +20,9 @@
|
||||||
<% if @student_assignment.new_record? %>
|
<% if @student_assignment.new_record? %>
|
||||||
<%= f.hidden_field :course_assignment_id,:value=>@course_assignment.id.to_s %>
|
<%= f.hidden_field :course_assignment_id,:value=>@course_assignment.id.to_s %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<% if params[:type] == "view" %>
|
||||||
|
<% @closed = true %>
|
||||||
|
<% end %>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend><%= @course_assignment.course.title rescue "" %>-<%= @course_assignment.name rescue "" %></legend>
|
<legend><%= @course_assignment.course.title rescue "" %>-<%= @course_assignment.name rescue "" %></legend>
|
||||||
<!-- Name -->
|
<!-- Name -->
|
||||||
|
@ -71,6 +74,7 @@
|
||||||
<div class="input-area">
|
<div class="input-area">
|
||||||
|
|
||||||
<!-- Language Tabs -->
|
<!-- Language Tabs -->
|
||||||
|
<!--
|
||||||
<div class="nav-name"><strong><%= t(:language) %></strong></div>
|
<div class="nav-name"><strong><%= t(:language) %></strong></div>
|
||||||
<ul class="nav nav-pills language-nav">
|
<ul class="nav nav-pills language-nav">
|
||||||
<% @site_in_use_locales.each_with_index do |locale, i| %>
|
<% @site_in_use_locales.each_with_index do |locale, i| %>
|
||||||
|
@ -85,28 +89,16 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<!-- Language -->
|
|
||||||
<div class="tab-content language-area">
|
<div class="tab-content language-area">
|
||||||
|
|
||||||
<% @site_in_use_locales.each_with_index do |locale, i| %>
|
<% @site_in_use_locales.each_with_index do |locale, i| %>
|
||||||
|
|
||||||
<div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
|
<div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
|
||||||
|
|
||||||
<div class="control-group input-title">
|
|
||||||
<label class="control-label muted"><%= t("personal_selected_course.assignment_content") %></label>
|
|
||||||
<div class="controls">
|
|
||||||
<% if !@closed %>
|
|
||||||
<%= f.fields_for :assignment_content_translations do |f| %>
|
|
||||||
<%= f.text_area locale, class: "input-block-level ckeditor", placeholder: t("personal_selected_course.assignment_content"), value: (@student_assignment.assignment_content_translations[locale] rescue nil) %>
|
|
||||||
<% end %>
|
|
||||||
<% else %>
|
|
||||||
<%= @student_assignment.assignment_content_translations[locale] rescue nil %>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div> -->
|
||||||
<div class="nav-name"><strong><%= t(:module) %></strong></div>
|
<div class="nav-name"><strong><%= t(:module) %></strong></div>
|
||||||
<ul class="nav nav-pills module-nav">
|
<ul class="nav nav-pills module-nav">
|
||||||
<li></li>
|
<li></li>
|
||||||
|
@ -126,6 +118,17 @@
|
||||||
<% if @member_profile.present? %>
|
<% if @member_profile.present? %>
|
||||||
<%= f.hidden_field :member_profile_id, :value=>@member_profile.id %>
|
<%= f.hidden_field :member_profile_id, :value=>@member_profile.id %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<div class="control-group input-title" style="width: 90%;">
|
||||||
|
<label class="control-label muted"><%= t("personal_selected_course.assignment_content") %></label>
|
||||||
|
<div class="controls">
|
||||||
|
<% if !@closed %>
|
||||||
|
<%= f.text_area :assignment_content, class: "input-block-level ckeditor", placeholder: t("personal_selected_course.assignment_content"), value: (@student_assignment.assignment_content rescue nil) %>
|
||||||
|
<% else %>
|
||||||
|
<%= @student_assignment.assignment_content rescue nil %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="clear: both;"></div>
|
||||||
<!-- Attachment -->
|
<!-- Attachment -->
|
||||||
<%
|
<%
|
||||||
files_hash = {}
|
files_hash = {}
|
||||||
|
@ -160,7 +163,7 @@
|
||||||
<a class="add_file trigger btn btn-small btn-primary" for="<%= file %>"><i class="icons-plus"></i> <%= t(:add) %></a>
|
<a class="add_file trigger btn btn-small btn-primary" for="<%= file %>"><i class="icons-plus"></i> <%= t(:add) %></a>
|
||||||
</p>
|
</p>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= @student_assignment.send("display_"+file.pluralize) rescue "" %>
|
<%= @student_assignment.send("display_"+file.pluralize) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -51,18 +51,18 @@
|
||||||
<% if !closed %>
|
<% if !closed %>
|
||||||
<ul class="nav nav-pills hide">
|
<ul class="nav nav-pills hide">
|
||||||
<% if student_assignment.nil? %>
|
<% if student_assignment.nil? %>
|
||||||
<li><%= link_to t('new_'), new_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page]) %></li>
|
<li><%= 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) %></li>
|
||||||
<% else %>
|
<% else %>
|
||||||
<li><%= 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) %></li>
|
<li><%= 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) %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span style="color: red;"><%=t('personal_selected_course.closed')%></span>
|
<span style="color: red;"><%=t('personal_selected_course.closed')%></span>
|
||||||
<ul class="nav nav-pills hide">
|
<ul class="nav nav-pills hide">
|
||||||
<% if student_assignment.nil? %>
|
<% if student_assignment.nil? %>
|
||||||
<li><%= link_to t('personal_selected_course.view'), new_assignment_admin_selected_courses_path(:uid=>course_assignment.uid,:name=>course_assignment.name,:page => params[:page]) %></li>
|
<li><%= 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) %></li>
|
||||||
<% else %>
|
<% else %>
|
||||||
<li><%= 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) %></li>
|
<li><%= 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) %></li>
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
Loading…
Reference in New Issue