From d054162bbeaa21f80a0141e166f847e3772c6749 Mon Sep 17 00:00:00 2001 From: maxwell Date: Wed, 18 Aug 2010 20:51:55 -0700 Subject: [PATCH 1/2] more RC updating stuff --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index e8d5616f0..38c31c879 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,4 @@ -Diaspora::Application.routes.draw do |map| +Diaspora::Application.routes.draw do resources :people resources :users, :only => [:edit, :show, :update] resources :status_messages From 284601c6b1e4e8df7dfd76708a14441905ecd4cb Mon Sep 17 00:00:00 2001 From: ilya Date: Wed, 18 Aug 2010 20:59:01 -0700 Subject: [PATCH 2/2] got moved photo.image.stuff to photo.url[:stuff] --- app/helpers/photos_helper.rb | 2 +- app/views/users/edit.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb index b9231fe94..c518ceec5 100644 --- a/app/helpers/photos_helper.rb +++ b/app/helpers/photos_helper.rb @@ -1,7 +1,7 @@ module PhotosHelper def linked_scaled_photo(photo, album) - link_to (image_tag photo.image.url(:scaled_full)), photo_path(album.next_photo(photo)), :rel => "prefetch" + link_to (image_tag photo.url(:scaled_full)), photo_path(album.next_photo(photo)), :rel => "prefetch" end def link_to_prev(photo, album) diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 24aa8e7f0..670739246 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -16,11 +16,11 @@ = p.hidden_field :image_url, :value => @profile.image_url, :id => 'image_url_field' - for photo in @photos - if photo.url(:thumb_medium) == @profile.image_url - %div.small_photo{:id => photo.image.thumb_medium.url, :class=>'selected'} + %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'} = check_box_tag 'checked_photo', true, true = link_to image_tag(photo.url(:thumb_medium)), "#" - else - %div.small_photo{:id => photo.image.thumb_medium.url} + %div.small_photo{:id => photo.url(:thumb_medium)} = check_box_tag 'checked_photo' = link_to image_tag(photo.url(:thumb_medium)), "#" =will_paginate @photos