@@ -66,26 +66,19 @@ class PhotosController < ApplicationController # Mark a photo as primary. # This marks the other photos as non-primary as a side-effect. def update - if @photo.nil? or @photo.primary? - redirect_to edit_person_url(current_person) and return - end - # This should only have one entry, but be paranoid. - @old_primary = current_person.photos.select(&:primary?) - + @photo = Photo.find(params[:id]) respond_to do |format| - if @photo.update_attributes(:primary => true) - @old_primary.each { |p| p.update_attributes!(:primary => false) } - format.html { redirect_to(edit_person_path(current_person)) } - else - format.html do - flash[:error] = "Invalid image!" - redirect_to home_url - end + if @photo.update_attributes(params[:photo]) + flash[:success] = "Photo successfully updated" + format.html { redirect_to(photo_path(@photo)) } + else + format.html { render :action => "new" } end end end def destroy + @gallery = @photo.gallery redirect_to person_galleries_path(current_person) and return if @photo.nil? @photo.destroy flash[:success] = "Photo deleted" @@ -141,7 +134,7 @@ class PhotosController < ApplicationController def correct_user_required @photo = Photo.find(params[:id]) if @photo.nil? - redirect_to edit_person_url(current_person) + redirect_to home_url elsif @photo.person != current_person redirect_to home_url end app/controllers/photos_controller.rb @@ -1,2 +1,5 @@ <%=link_to image_tag(photo.public_filename(:thumbnail)), photo_path(photo)%><br/> -<%=link_to image_tag("icons/close.gif"), photo_path(photo), :method => :delete, :confirm => "Do you really want to delete the photo?"%> +<% if current_person == photo.person %> + <%=link_to "Edit", edit_photo_path(photo) %> | + <%=link_to image_tag("icons/close.gif"), photo_path(photo), :method => :delete, :confirm => "Do you really want to delete the photo?"%> +<% end %> app/views/galleries/_photo.html.erb @@ -1,13 +1,27 @@ <%= error_messages_for :photo %> -<% form_for @photo, :html => { :multipart => true } do |f| -%> - <div class="form_field"> - <%= image_tag(@display_photo.public_filename(:thumbnail)) %><br /> - <label for="photo">Update your photo:</label><br /> - <%= f.file_field :uploaded_data %> - </div> - <div class="form_field"> - <%= submit_tag 'Update' %> - <%= f.submit "Cancel", :id => "cancel" %> - </div> -<% end -%> \ No newline at end of file + +<%- column_div :type => :primary do -%> +<h2>Edit photo</h2> + + <% form_for @photo, :html => { :multipart => true } do |f| -%> + <div class="form_field"> + <%= image_tag(@display_photo.public_filename(:thumbnail)) %> + </div> + + <div class="form_field"> + <label for="photo">Title:</label> + <%= f.text_field :title %> + </div> + <div class="form_field"> + <label for="photo">Upload a photo:</label> + <%= f.file_field :uploaded_data %> + </div> + <div class="form_field"> + <%= submit_tag 'Update' %> + <%= f.submit "Cancel", :id => "cancel" %> + </div> + <% end -%> + +<% end %> + \ No newline at end of file app/views/photos/edit.html.erb 9487f18d0557d58fb37b6e729e929d701ef470b0 Piotr Jakubowski piotrj@piotr-jakubowskis-macbook.local http://github.com/piotrj/insoshi/commit/33b28d9f6ee33754f94f880dcb5f59ddf6ed9d4e 33b28d9f6ee33754f94f880dcb5f59ddf6ed9d4e 2008-06-19T21:31:54-07:00 2008-06-15T18:20:42-07:00 Photo editing 6bc3066b9dfa1c73a80cec1317371397827a9d0c Long Nguyen long@dr4gn.com