From d13342ac1ed2a69697a8cd08dbd7d78e63ef29c1 Mon Sep 17 00:00:00 2001 From: Andrew Davidson Date: Sun, 1 Nov 2009 00:22:50 -0700 Subject: [PATCH] changing attribution to use real name if available, username if not --- app/helpers/flickr_helper.rb | 8 ++++++-- app/views/layouts/application.html.erb | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/helpers/flickr_helper.rb b/app/helpers/flickr_helper.rb index d14da57..6ac7791 100644 --- a/app/helpers/flickr_helper.rb +++ b/app/helpers/flickr_helper.rb @@ -8,8 +8,12 @@ module FlickrHelper end end - def get_username (user_id) - return flickr.people.getInfo(:user_id => user_id).username + def get_name (user_id) + + name = flickr.people.getInfo(:user_id => user_id).username unless name = flickr.people.getInfo(:user_id => user_id).realname + + return name + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e5a67b1..b36a223 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,7 +13,7 @@ <%= yield %>