activeadmin-selleo-cms 0.0.38 → 0.0.39

data/app/admin/activeadmin_selleo_cms/attachment.rb

@@ -6,6 +6,16 @@ ActiveAdmin.register ActiveadminSelleoCms::Attachment, as: 'Attachment' do
   controller do
     respond_to :html, :js
 
+    before_filter :set_styles, only: [:create, :update]
+
+    private
+
+    def set_styles
+      params[:image][:cover] = params[:image].delete :cover
+    end
+
+    public
+
     def edit
       super do |format|
         format.html { render action: :edit, layout: false }

data/app/admin/activeadmin_selleo_cms/image.rb

@@ -6,6 +6,16 @@ ActiveAdmin.register ActiveadminSelleoCms::Image, as: 'Image' do
   controller do
     respond_to :html, :js
 
+    before_filter :set_styles, only: [:create, :update]
+
+    private
+
+    def set_styles
+      params[:image][:data] = params[:image].delete :data
+    end
+
+    public
+
     def edit
       super do |format|
         format.html { render action: :edit, layout: false }
@@ -17,7 +27,6 @@ ActiveAdmin.register ActiveadminSelleoCms::Image, as: 'Image' do
         format.html { render action: :new, layout: false }
       end
     end
-
   end
 
 end

data/app/models/activeadmin_selleo_cms/asset.rb

@@ -10,7 +10,7 @@ module ActiveadminSelleoCms
     has_attached_file :cover,
                       :url  => "/system/cms/covers/:id/:style_:basename.:extension",
                       :path => ":rails_root/public/system/cms/covers/:id/:style_:basename.:extension",
-                      :styles => Proc.new{ |attachment| attachment.instance.image_sizes },
+                      :styles => Proc.new{ |attachment| attachment.instance.cover_sizes },
                       :default_style => :normal
 
     validates_attachment_size :cover, :less_than => 10.megabytes
@@ -20,7 +20,7 @@ module ActiveadminSelleoCms
       data.url(format)
     end
 
-    def image_sizes
+    def cover_sizes
       { :normal => "#{cover_width || 120}x#{cover_height || 90}#{cover_resize_method || ">"}" }
     end
 

data/app/models/activeadmin_selleo_cms/image.rb

@@ -1,6 +1,6 @@
 module ActiveadminSelleoCms
   class Image < ActiveadminSelleoCms::Asset
-    attr_accessor :image_width, :image_height, :resize_method, :cover_width, :cover_height
+    attr_accessor :image_width, :image_height, :resize_method
 
     has_attached_file :data,
                       :url  => "/system/cms/images/:id/:style_:basename.:extension",

data/app/views/admin/images/_form.html.haml

@@ -3,8 +3,11 @@
   -#= @page.errors.full_messages
 
   = form.inputs id: 'image_fields' do
-    = form.input :data, label: "Image", hint: (resource.data.exists? ? image_tag(resource.data.url, style: "max-width:520px") : "No image")
     = form.input :assetable_type, as: :hidden, input_html: { value: resource.assetable_type }
     = form.input :assetable_id, as: :hidden, input_html: { value: resource.assetable_id }
+    = form.input :image_width, as: :hidden, input_html: { value: resource.assetable.activeadmin_selleo_cms_section.width }
+    = form.input :image_height, as: :hidden, input_html: { value: resource.assetable.activeadmin_selleo_cms_section.height }
+    = form.input :resize_method, as: :hidden, input_html: { value: resource.assetable.activeadmin_selleo_cms_section.resize_method }
+    = form.input :data, label: "Image", hint: (resource.data.exists? ? image_tag(resource.data.url, style: "max-width:520px") : "No image")
     = form.input :caption
   = form.actions :submit

data/lib/activeadmin-selleo-cms/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSelleoCms
-  VERSION = "0.0.38"
+  VERSION = "0.0.39"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-selleo-cms
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.39
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails