diff --git a/admin/app/admin/promo_buzz.rb b/admin/app/admin/promo_buzz.rb index 741af4af1..e87d85e33 100644 --- a/admin/app/admin/promo_buzz.rb +++ b/admin/app/admin/promo_buzz.rb @@ -99,9 +99,10 @@ ActiveAdmin.register JamRuby::PromoBuzz, :as => 'Buzz' do def new @promo = JamRuby::PromoBuzz.new + @promo.key = params[:key] if params[:key].present? @promo.aasm_state = 'active' @uploader = @promo.image - # @uploader.success_action_redirect = new_painting_url + @uploader.success_action_redirect = new_admin_buzz_url super end diff --git a/admin/app/uploaders/image_uploader.rb b/admin/app/uploaders/image_uploader.rb index 82008cbc5..bde053642 100644 --- a/admin/app/uploaders/image_uploader.rb +++ b/admin/app/uploaders/image_uploader.rb @@ -5,7 +5,6 @@ class ImageUploader < CarrierWave::Uploader::Base include CarrierWave::MimeTypes process :set_content_type - storage :fog # Add a white list of extensions which are allowed to be uploaded. def extension_white_list diff --git a/admin/app/views/admin/buzzs/_form.html.erb b/admin/app/views/admin/buzzs/_form.html.erb index bf64b25d6..cffb5c38e 100644 --- a/admin/app/views/admin/buzzs/_form.html.erb +++ b/admin/app/views/admin/buzzs/_form.html.erb @@ -5,7 +5,7 @@ <%= f.input(:text_long, :label => "Long Text", :input_html => {:rows => 3, :maxlength => 4096}) %> <%= f.input(:aasm_state, :as => :select, :collection => Promotional::STATES, :label => 'Status') %>
File: <%= @promo.image_name %>
- <% # = f.hidden_field :key %> + <%= f.hidden_field :key %> <% # = f.input(:photo, :as => :file, :hint => f.template.image_tag(@promo.image_url(:thumb), :size => '50x50')) if @promo.new_record? %> <% end %> <%= f.actions %>