From b89ca5deb87df339a6573cbeffa5f71a0109884a Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 10 Jan 2016 01:28:48 +0100 Subject: [PATCH] Quick correction, so the versions screen does display properly. Refs #15 --- app/views/versions/index.haml | 12 ++++++++---- app/views/versions/index.rss.builder | 5 ++--- config/locales/views/en.yml | 1 + config/locales/views/fr.yml | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/views/versions/index.haml b/app/views/versions/index.haml index 3e0daeee..d0100ded 100644 --- a/app/views/versions/index.haml +++ b/app/views/versions/index.haml @@ -14,11 +14,10 @@ - @versions.each do |version| :ruby if version.event == 'create' - object = version.item_type.constantize.find version.item_id - else - object = version.reify + object = version.item_type.constantize.find_by_id version.item_id end - next unless object.moderated? + object = version.reify if object.nil? + next unless object.try(:moderated?) changes = '' if version.event == 'update' @@ -47,3 +46,8 @@ %em.fa.fa-eye = paginate @versions + +.formats + = link_to versions_path do + %em.fa.fa-rss + = t '.feed' diff --git a/app/views/versions/index.rss.builder b/app/views/versions/index.rss.builder index d7738297..d81a4ead 100644 --- a/app/views/versions/index.rss.builder +++ b/app/views/versions/index.rss.builder @@ -37,10 +37,9 @@ xml.rdf :RDF, @versions.each do |version| if version.event == 'create' - object = version.item_type.constantize.find version.item_id - else - object = version.reify + object = version.item_type.constantize.find_by_id version.item_id end + object = version.reify if object.nil? next unless object.moderated? url = polymorphic_url(version.item_type.tableize.singularize, id: version.item_id) diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml index b9f7c31e..9a835328 100644 --- a/config/locales/views/en.yml +++ b/config/locales/views/en.yml @@ -398,3 +398,4 @@ reason: create_html: update_html: destroy_html: + feed: RSS feed diff --git a/config/locales/views/fr.yml b/config/locales/views/fr.yml index 58a0d756..1b17897e 100644 --- a/config/locales/views/fr.yml +++ b/config/locales/views/fr.yml @@ -398,3 +398,4 @@ l'adresse:" create_html: update_html: destroy_html: + feed: Flux RSS