From 63fde3165e965d4564ad3dd766024ffacdbb0587 Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Fri, 5 Jun 2009 22:48:32 -0500 Subject: [PATCH] Redirected Pages are not Wanted Pages ... and should not be listed as such on the "list" pages. --- app/models/wiki_reference.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/wiki_reference.rb b/app/models/wiki_reference.rb index 5e8ffae5..d4db97f0 100644 --- a/app/models/wiki_reference.rb +++ b/app/models/wiki_reference.rb @@ -13,7 +13,13 @@ class WikiReference < ActiveRecord::Base validates_inclusion_of :link_type, :in => [LINKED_PAGE, WANTED_PAGE, REDIRECTED_PAGE, INCLUDED_PAGE, CATEGORY, AUTHOR, FILE, WANTED_FILE] def self.link_type(web, page_name) - web.has_page?(page_name) ? LINKED_PAGE : WANTED_PAGE + if web.has_page?(page_name) + LINKED_PAGE + elsif self.page_that_redirects_for(web, page_name) + REDIRECTED_PAGE + else + WANTED_PAGE + end end def self.pages_that_reference(web, page_name)