From 2c7bf77f4b04e58589896eebbb41a8af9269e1b7 Mon Sep 17 00:00:00 2001 From: Coleman Date: Sat, 26 Jul 2008 23:44:51 -0500 Subject: [PATCH] only check for one, not both --- app/views/albums/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb index 1a9a22f..1bc256a 100644 --- a/app/views/albums/show.html.erb +++ b/app/views/albums/show.html.erb @@ -5,7 +5,7 @@ <% if allowed_to?(:upload_images) -%> Upload Image
<% end %> <% ptags = @photos.collect { |p| p.photo_tags.collect { |pt| pt.tag.name } }.flatten.uniq -%> - <% if !@album.tags.empty? and !ptags.empty? -%> + <% if !@album.tags.empty? or !ptags.empty? -%>
<% unless @album.tags.empty? -%>

Album Tags