@@ -46,12 +46,15 @@ class AlbumPicturesController < ApplicationController @album_picture = @album.pictures.find(params[:id]) @new_picture = !params[:is_new].nil? - unless @new_picture + if !@new_picture el_id = @album.pictures.find(:first, :conditions => ['position < ?', @album_picture.position], :select => 'id', :order => 'position DESC') @insert_element = "album_picture_#{el_id}" unless el_id.nil? + + elsif params[:el_id] + @insert_element = params[:el_id] end @insert_element ||= 'album_picture_form' app/controllers/album_pictures_controller.rb @@ -9,7 +9,7 @@ %ul.albumPictures{:id => "sortable_album_#{object.id}"} = render :partial => 'album_pictures/show', :collection => object.pictures - if object.can_be_edited_by(@logged_user) - %li.albumPictureForm{:id => 'album_picture_form'} + %li.albumPictureForm{:id => "album_picture_form_#{object.id}"} .inner{:style => (@new_album.nil? ? 'display:none' : nil)} = render :partial => 'album_pictures/form', :locals => {:object => object} .newPicture{:style => (@new_album.nil? ? nil : 'display:none')} app/views/albums/_show.html.haml @@ -645,7 +645,7 @@ var Page = { onNewAlbumPictureSubmit: function(evt) { var el = $(this); - el.requestIframeScript({'is_new': 1}, JustRebind); + el.requestIframeScript({'is_new': 1, 'el_id': $(this).parents(".albumPictureForm:first").attr("id")}, JustRebind); return true; }, public/javascripts/application.js 1c57509a8a6a0847963dee8a389dedf02545ff11 keith keith@firebellydesign.com http://github.com/jamesu/rucksack/commit/5848e28ed860660a87f1fc2925c7e76ddd6debb2 5848e28ed860660a87f1fc2925c7e76ddd6debb2 2009-08-03T12:22:24-07:00 2009-08-03T08:33:33-07:00 The id of the photo upload form was hard coded to album_picture_form so if there were multiple albums on a page, when the rjs dynamically inserted the uploaded photo content 'before' the album_picture_form, it would always insert the photo into the first album on the page. This is fixed now so that photos get inserted into the correct album upon uploading Signed-off-by: James Urquhart <jamesu@gmail.com> 2f78695e49ba6afa7f7f4fee145b746ef9eb96c3 James Urquhart jamesu@gmail.com