diff --git a/app/models/writing.rb b/app/models/writing.rb index 95fffbc..c568139 100644 --- a/app/models/writing.rb +++ b/app/models/writing.rb @@ -6,7 +6,7 @@ class Writing belongs_to :member_profile - field :lab_title, :as=>:slug_title, localize: true + field :writing_title, :as=>:slug_title, localize: true field :location, localize: true field :participating_professor, localize: true field :participating_student, localize: true @@ -24,8 +24,8 @@ class Writing # paginates_per 10 - has_many :lab_files, :autosave => true, :dependent => :destroy - accepts_nested_attributes_for :lab_files, :allow_destroy => true + has_many :writing_files, :autosave => true, :dependent => :destroy + accepts_nested_attributes_for :writing_files, :allow_destroy => true before_validation :add_http @@ -45,7 +45,7 @@ class Writing fields_to_show = [ "year", - "lab_title", + "writing_title", "location" ] @@ -70,7 +70,7 @@ class Writing pd_data = [] fields_to_show.collect do |t| - if t == "lab_title" + if t == "writing_title" pd_data << { "data_title" => "#{p.send(t)}" } else pd_data << { "data_title" => p.send(t) } @@ -93,9 +93,9 @@ class Writing value = I18n.t(self.language) rescue "" when "file" files = [] - self.lab_files.each do |lab_file| - url = lab_file.file.url - title = (lab_file.title.blank? ? File.basename(lab_file.file.path) : lab_file.title) + self.writing_files.each do |writing_file| + url = writing_file.file.url + title = (writing_file.title.blank? ? File.basename(writing_file.file.path) : writing_file.title) files << "
  • #{title}
  • " end value = files.join("") diff --git a/app/views/admin/writings/_writing.html.erb b/app/views/admin/writings/_writing.html.erb index 49e686f..2ccb3e7 100644 --- a/app/views/admin/writings/_writing.html.erb +++ b/app/views/admin/writings/_writing.html.erb @@ -1,12 +1,12 @@ -<% @labs.each do |writing| %> +<% @writings.each do |writing| %> "> <%= writing.year %> - <%= link_to writing.lab_title, OrbitHelper.url_to_plugin_show(writing.to_param,'personal_writing'), target: "blank"%> + <%= link_to writing.writing_title, OrbitHelper.url_to_plugin_show(writing.to_param,'personal_writing'), target: "blank"%>