@@ -8,13 +8,12 @@ module Qcontent module Macros def has_assets(group_name, options = {}) - has_many :content_assets, :as => :content, :dependent => :delete_all has_many "content_#{group_name}", :class_name => 'ContentAsset', :order => 'content_assets.position ASC', :as => :content, :conditions => "content_assets.asset_group = '#{group_name}'" - has_many group_name, :through => "content_#{group_name}", :source => :asset + has_many group_name, :through => "content_#{group_name}", :source => :asset, :order => 'content_assets.position ASC' include InstanceMethods alias_method "#{group_name}_association=", "#{group_name}=" @@ -60,7 +59,7 @@ module Qcontent asset = Asset.create({:dir => group_name.to_s}.merge(asset_attributes)) self.content_assets.create(:asset_id => asset.id, :position => position, :asset_group => group_name.to_s) if asset elsif asset_attributes.to_i > 0 - self.content_assets.create(:asset_id => asset_attributes.to_i, :position => position, :asset_group => group_name.to_s) + self.content_assets.create(:asset_id => asset_attributes.to_i, :position => (position.to_i + 1), :asset_group => group_name.to_s) end end end lib/qcontent/assets.rb @@ -39,7 +39,7 @@ module Qcontent end def inspect - "<Dimension: #{name}, #{dimension_s}>" + "<:Dimension: #{name}, #{dimension_s}:>" end private lib/qcontent/dimension.rb a3337c08abd237ea08c91005dfcdaf2325ac34b4 Aaron Quint aaron@quirkey.com http://github.com/quirkey/qcontent/commit/597cbe3e2a426857d3875ffc543413a377e46534 597cbe3e2a426857d3875ffc543413a377e46534 2009-06-29T21:01:53-07:00 2009-06-29T21:01:53-07:00 Enforce sorting for assets bd6daa64ed915ac2739661b065f4aa0250a17414 Aaron Quint aaron@quirkey.com