Changeset 7
- Timestamp:
- 03/17/08 22:23:52 (9 months ago)
- Files:
-
- trunk/rails/app/models/flickr_user.rb (modified) (2 diffs)
- trunk/rails/app/views/home/index.html.erb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/rails/app/models/flickr_user.rb
r4 r7 6 6 include FlickrAware 7 7 8 attr_accessor :id, :username, :photosets 8 attr_accessor :id, :username, :photosets, :email 9 9 10 10 def FlickrUser.find_by_nsid(nsid) … … 38 38 flickr_user_name = d.root.get_elements("//username")[0].get_text 39 39 @username = flickr_user_name 40 true 40 41 else 41 42 false 42 43 end 43 else 44 elsif @username =~ /@/ # very lazy regex check for an email address 45 @email = @username 46 d = FlickrAware.invoke("flickr.people.findByEmail", :find_email => @email) 47 if d 48 flickr_user_id = d.root.get_elements("//user")[0].attributes["id"] 49 @id = flickr_user_id 50 @username = d.root.get_elements("//username")[0].get_text 51 true 52 else 53 false 54 end 55 else 44 56 d = FlickrAware.invoke("flickr.people.findByUsername", :username => @username) 45 57 if d trunk/rails/app/views/home/index.html.erb
r6 r7 16 16 </table> 17 17 18 <p style="margin: 0;padding: 0; margin-top: 100px">Username : </p>18 <p style="margin: 0;padding: 0; margin-top: 100px">Username or e-mail address: </p> 19 19 <p style="color: red"><%= flash[:notice] %></p> 20 20 <% form_for :flickr_user , :url => { :controller => "flickr_users" , :action => "create" } do |f| %>
