diff --git a/app/controllers/archives_controller.rb b/app/controllers/archives_controller.rb index 945e793..a7c46d1 100644 --- a/app/controllers/archives_controller.rb +++ b/app/controllers/archives_controller.rb @@ -17,12 +17,13 @@ class ArchivesController < ApplicationController end end cats = @categories.collect do |cat| - archives = ArchiveFile.can_display.where(:category_id => cat["id"]).collect do |archive| - statuses = archive.statuses.collect do |status| - { - "archive-status" => status - } - end + archives = ArchiveFile.where(:category_id => cat["id"]).collect do |archive| + statuses = archive.statuses_with_classname.collect do |status| + { + "status" => status["name"], + "status-class" => "status-#{status['classname']}" + } + end files = archive.archive_file_multiples.collect do |file| { "file-name" => file.file_title, @@ -32,7 +33,7 @@ class ArchivesController < ApplicationController end { "archive-title" => archive.title, - "status" => statuses, + "statuses" => statuses, "files" => files } end