caboose-cms 0.5.228 → 0.5.229

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU1ZDMxMTQwNjIyYTBmMzBjMTRkODRlMzFhODk0YzAwMjhmMjU3MQ==
+    MzI4M2UxMzRhNjIyNjlmNWI5MTgyNzFiNDQ4ZDU0MGI3YjUyODc5NA==
   data.tar.gz: !binary |-
-    ZWViOGE1NDYzYzBlZWRkMWQwOTU5NWNjODlkOTAyZTlhZWE1MjdlZQ==
+    OWQ1ZWUzYmU0ZjE4NTE5ZWI5M2FiMGQxYjMyNzk5ZTdhYjBjYWZmYg==
 SHA512:
   metadata.gz: !binary |-
-    MzBkYzc1YTZlMGRjMjU5ZmI1ZTY5MGQyN2FkOTJkZWY3NDYwZTBlZmU5M2Mz
-    ZDM3MzNiNmEwMmYxOGY2NmYyY2Y0YWVhYjRlNjkyOGZiYWExMDE5NjdmZjgz
-    N2UzZmJiNzk5MmVjNmZkMDVhNWM1MDE0YTQ4MmZkNzA3MmNmMWI=
+    MjcxMGNhODYxZjBiNzM2ZDBjNDUwY2FmMDk4NWYyMmU0YTJmNzAxM2JmZTU3
+    Yzg0NGU5ZjA2ZjRhZTQ5ODI4NTE2ZTAyZWExNTUxMTEzMjRiNzI3NGUxM2Y1
+    ZjRkYzRhNTdiNzAyNjI3MzE2OGZjOTJiMjg5ZDk0NTQ2OGFhNjk=
   data.tar.gz: !binary |-
-    NDU0ZWZlZGZhMWZkZWQzYjY3N2JiYjY2MzYzY2I5YmEyYjhiMmI1MmUwZjQ5
-    NjUxY2M1M2M3MWMzN2I2NmE3ZjdkYjRkNDA2YzQ2YmY0NjkxYTAxOTNlZWMw
-    ZTA5YzYzOTQzZGVmN2I1NzRhMDliMmFiYWYyMGQyZWYyMjBmZjU=
+    NzUzZGZhMGU0OWZjMmI5YjFkNjFmMDkyNDQ0OTI2Yjk2YmU3MTRmNWJiNTcz
+    MDdkZmY4ZDQxZTg1ZGYyZTdhZWM3ZWNjOTQ1MWI3Y2NhMGM2YzZhNDBkOGE5
+    MWUzYTIxZTBkZmJlNGNjYzE2YTUxZGExYWE0NWIxYzBmMWNmMDk=

data/app/models/caboose/block.rb

@@ -506,7 +506,8 @@ class Caboose::Block < ActiveRecord::Base
       
       site_id = self.page_id ? self.page.site_id : self.post.site_id
       cat = Caboose::MediaCategory.top_category(site_id)      
-      m = Caboose::Media.create(:media_category_id => cat.id, :original_name => self.image_file_name, :name => Caboose::Media.upload_name(self.image_file_name))        
+      m = self.media
+      m = Caboose::Media.create(:media_category_id => cat.id, :original_name => self.image_file_name, :name => Caboose::Media.upload_name(self.image_file_name)) if m.nil?      
       m.image = URI.parse(self.image.url(:original))
       m.processed = true
       m.save
@@ -517,8 +518,9 @@ class Caboose::Block < ActiveRecord::Base
     elsif self.block_type.field_type == 'file' && !self.file_file_name.nil? && self.media_id.nil?
       
       site_id = self.page_id ? self.page.site_id : self.post.site_id
-      cat = Caboose::MediaCategory.top_category(site_id)      
-      m = Caboose::Media.create(:media_category_id => cat.id, :original_name => self.file_file_name, :name => Caboose::Media.upload_name(self.file_file_name))        
+      cat = Caboose::MediaCategory.top_category(site_id)
+      m = self.media      
+      m = Caboose::Media.create(:media_category_id => cat.id, :original_name => self.file_file_name, :name => Caboose::Media.upload_name(self.file_file_name)) if m.nil?        
       m.file = URI.parse(self.file.url)
       m.processed = true
       m.save

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.228'
+  VERSION = '0.5.229'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.228
+  version: 0.5.229
 platform: ruby
 authors:
 - William Barry