deac/photomix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

updated so tag listing works. find_by_title instead of id

Browse source
This commit is contained in:
Espen Antonsen 2010-08-07 13:30:53 +02:00
parent c049033193
commit 670c7dad5e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/photos_controller.rb
View file

@ -5,9 +5,9 @@ class PhotosController < ApplicationController
def index def index
if params[:tag_id] && params[:album_id] if params[:tag_id] && params[:album_id]
@photos = Tag.find( params[:tag_id] ).photos.find(:all, :conditions => ['photos.album_id = :album', {:album => Album.find(params[:album_id] ) } ], :order => "photos.id ASC") @photos = Tag.find_by_title( params[:tag_id] ).photos.find(:all, :conditions => ['photos.album_id = :album', {:album => Album.find(params[:album_id] ) } ], :order => "photos.id ASC")
elsif params[:tag_id] elsif params[:tag_id]
@photos = Tag.find( params[:tag_id] ).photos.find(:all, :order => "photos.id ASC") @photos = Tag.find_by_title( params[:tag_id] ).photos.find(:all, :order => "photos.id ASC")
elsif params[:album_id] elsif params[:album_id]
@photos = Album.find( params[:album_id]).photos.find(:all, :order => "photos.id ASC") @photos = Album.find( params[:album_id]).photos.find(:all, :order => "photos.id ASC")
elsif params[:q] elsif params[:q]

2
app/helpers/application_helper.rb
View file

@ -8,7 +8,7 @@ module ApplicationHelper
#links = "You are here: " #links = "You are here: "
links = content_tag('a', "HOME", :href => "/") if include_home links = content_tag('a', "HOME", :href => "/") if include_home
nocrumb = ["collections", "albums", "photos", "tags", "new", "edit"] nocrumb = ["collections", "albums", "photos", "tags", "new", "edit", "tags"]
levels.each_with_index do |level, index| levels.each_with_index do |level, index|
level = level.gsub(/^[0-9]+\-/,"") #if levels[index-1] == "photos" level = level.gsub(/^[0-9]+\-/,"") #if levels[index-1] == "photos"

2
app/models/tag.rb
View file

@ -11,7 +11,7 @@ class Tag < ActiveRecord::Base
end end
def to_param def to_param
"#{id}-#{title.parameterize}" title.parameterize
end end
protected protected