Commit 69621178
Changed files (2)
app
controllers
views
photos
app/controllers/creations_controller.rb
@@ -41,8 +41,9 @@ class CreationsController < ApplicationController
@creation.category_ids = params[:creation][:category_ids] ||= []
if @creation.update_attributes(params[:creation])
- redirect_to(@creation, :notice => 'Creation was successfully updated.')
+ redirect_to new_creation_photo_url(@creation)
else
+ flash[:error] = @creation.errors.full_messages
render :action => "edit"
end
end
app/views/photos/_form.html.erb
@@ -16,11 +16,13 @@
<% end %>
<div>
- <h2>Upload file</h2>
<%= form_for [@creation, @photo], :html => { :multipart => true, :id => "fileupload" } do |f| %>
<div class="row fileupload-buttonbar">
- <div class="span7">
+ <div class="span3">
<span class="btn btn-success fileinput-button"><i class="icon-plus icon-white"></i><span>Add files...</span><%= f.file_field :image %></span>
+ <%= link_to "View", creation_path(@creation), :class => "btn" %>
+ </div>
+ <div class="span4">
<button type="submit" class="btn btn-primary start"><i class="icon-upload icon-white"></i><span>Start upload</span></button>
<button type="reset" class="btn btn-warning cancel"><i class="icon-ban-circle icon-white"></i><span>Cancel upload</span></button>
<button type="button" class="btn btn-danger delete"><i class="icon-trash icon-white"></i><span>Delete</span></button>