diff --git a/app/models/archive_file.rb b/app/models/archive_file.rb index b575da7..aa8aaaf 100644 --- a/app/models/archive_file.rb +++ b/app/models/archive_file.rb @@ -144,7 +144,7 @@ class ArchiveFile if org url_text else - url_text.present? ? url_text : "link" + url_text.present? ? url_text : self.title end end def get_data(more_url=nil, base_url=nil, cat_ids=nil, tag_ids=nil, locales=nil) @@ -304,8 +304,8 @@ class ArchiveFile self.urls.each_with_index do |url,i| serial_number += 1 files << { - "file-name" => self.title, - "file-type" => self.get_url_text(i), + "file-name" => self.get_url_text(i), + "file-type" => 'link', "file-url" => url, "serial_number" => serial_number } diff --git a/modules/archive/archive_index12.html.erb b/modules/archive/archive_index12.html.erb index a078919..f71b52f 100644 --- a/modules/archive/archive_index12.html.erb +++ b/modules/archive/archive_index12.html.erb @@ -1,4 +1,4 @@ -
+

{{page-title}}

@@ -35,4 +35,18 @@
{{link_to_edit}}
+ + \ No newline at end of file diff --git a/modules/archive/archive_index2.html.erb b/modules/archive/archive_index2.html.erb index 7982a22..c779d9b 100644 --- a/modules/archive/archive_index2.html.erb +++ b/modules/archive/archive_index2.html.erb @@ -15,13 +15,13 @@
-
+
{{archive-title}} {{status}}
-
+
{{file-name}} {{file-type}} @@ -33,4 +33,11 @@
{{link_to_edit}}
+ \ No newline at end of file