nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed 500 error with @photos

Browse source
This commit is contained in:
Daniel Vincent Grippi 2010-09-15 11:24:23 -07:00
parent 5d0f315793
commit ea3e372474
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/views/users/edit.html.haml
View file

@ -17,18 +17,28 @@
%h3 Picture %h3 Picture
%div#image_picker %div#image_picker
= p.hidden_field :image_url, :value => @profile.image_url.sub(@user.url,'/'), :id => 'image_url_field' = p.hidden_field :image_url, :value => (@profile.image_url.sub(@user.url,'/') if @profile.image_url), :id => 'image_url_field'
- for photo in @photos
- if photo.url(:thumb_medium) == @profile.image_url.sub(@user.url,'/') - unless @photos.nil? || @photos.empty?
%div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'} - for photo in @photos
= check_box_tag 'checked_photo', true, true - if photo.url(:thumb_medium) == @profile.image_url.sub(@user.url,'/')
= link_to image_tag(photo.url(:thumb_medium)), "#" %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'}
- else = check_box_tag 'checked_photo', true, true
%div.small_photo{:id => photo.url(:thumb_medium)} = link_to image_tag(photo.url(:thumb_medium)), "#"
= check_box_tag 'checked_photo' - else
= link_to image_tag(photo.url(:thumb_medium)), "#" %div.small_photo{:id => photo.url(:thumb_medium)}
= check_box_tag 'checked_photo'
= link_to image_tag(photo.url(:thumb_medium)), "#"
- else
You don't have any photos! Go to the
= link_to "albums", albums_path
page to upload some.
=will_paginate @photos =will_paginate @photos
%br
%h3 Info %h3 Info
%p %p