caboose-rets 0.0.28 → 0.0.29

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGQ0MGFjMTc3NjMyOGE0YjgyODQzMTMzODdhYjg1YjQ1YjcwMWI1Zg==
+    NDY5ZWM1ODFmNGNjOTQ3NGU3MDA1YzU2MDI3ZmJhOTc3MDRiYTRkNA==
   data.tar.gz: !binary |-
-    YmVkMDk0YTc4MGE1YjkwYTFiNDdhMjcxZTkwOTJkNWU1Y2QwOTBlYw==
+    OTAxYzQ3NzlkYThhNzhlNDUwMzM3MTEyYjRhM2FkOTE0NzU2YzQwOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDg1Y2VhZThjZjFmMTBhMjdjMzNkNGIxZGIwNzM4MWIyNjM4NDU4MDYyYTk4
-    Yjg5ZjY1YjM0NGIwZTQ3ZDQ1MzRhNDNlN2E3NWMyOGFiMWViN2E4ZmQ2NDQ3
-    MTUzZDIwMjYyNTJkOTBhMzY0NGVhYzlmY2NmNDM5ZjRiMjgyMzA=
+    YzY1ZDI3YzU3NTYyZjRiOTJjY2VkZmYxZGJiYjQwNWQ2MDRhNGFkZjRlOThj
+    MTNhYzNmMzViZWQ3NGJlMWExOTllZmZkNmYzZTQzZTdiMzUwOTRjNGVmY2Vh
+    Y2I2NzliYzU1MDgzZTFlNjdlYWU2Y2FjNWUyNTFhYzU0MjMwY2I=
   data.tar.gz: !binary |-
-    OWU3ZjAyM2I2ZGYyZjkyMTQ4ZjQyZTdhMjYyN2NmYmQ0ZGYzZDcxNmEyNzQw
-    OTI5NTZhZWE5YjI3YzkxNjU3ZWVlNzIwZWMyNTBhMTU0ODhkYjFjMmQyNmIz
-    M2RlZjA4OTJmNDQ3OTFhYzY3NTE1M2Y3MDdhNjgwNjVmNmIwZTc=
+    M2RjMjQyNjVhYTY4ZTIwZDEyYWFiMmMxMWJmZWNjMzNmODFlMTI2NWY3NWY2
+    MmUzNTNkYzYxMDZmZThjZWUxNjU4NjIxY2U3MTUxMzhjOTY3M2Y0MDEwZWY0
+    NmY0YzgyMDIyYTA0MTRkODA5ZTlmNmE2Y2Y1M2QzNTM4YjA2YTc=

data/app/assets/javascripts/caboose_rets/admin_media.js

@@ -45,6 +45,7 @@ MediaController.prototype = {
   
   sortable_files: function()
   {  
+    var that = this;
     $('#files').sortable({      
       placeholder: 'sortable-placeholder',
       handle: '.sort_handle',      

data/app/controllers/caboose_rets/media_controller.rb

@@ -36,7 +36,7 @@ module CabooseRets
     def admin_add_photo
       return if !user_is_allowed('media', 'edit')      
             
-      x = Media.maximum(:media_order, :conditions => {:mls_acct => params[:mls_acct]})
+      x = Media.maximum(:media_order, :conditions => {:mls_acct => params[:mls_acct], :media_type => 'Photo'})
       x = 0 if x.nil?
       
       m = Media.new
@@ -55,7 +55,7 @@ module CabooseRets
     def admin_add_file
       return if !user_is_allowed('media', 'edit')
 
-      x = Media.maximum(:media_order, :conditions => {:mls_acct => params[:mls_acct]})
+      x = Media.maximum(:media_order, :conditions => {:mls_acct => params[:mls_acct], :media_type => 'File'})
       x = 0 if x.nil?      
                   
       m = Media.new

data/app/models/caboose_rets/media.rb

@@ -2,7 +2,7 @@
 class CabooseRets::Media < ActiveRecord::Base
   self.table_name = "rets_media"
   
-  has_attached_file :file, :path => 'rets/media/:mls_acct_:media_order.:extension' 
+  has_attached_file :file, :path => 'rets/media/:mls_acct_:id.:extension' 
   has_attached_file :image, 
     :path => 'rets/media/:mls_acct_:media_order_:style.:extension', 
     :styles => {
@@ -43,22 +43,28 @@ class CabooseRets::Media < ActiveRecord::Base
     
     # Rename the s3 assets to temp names
     media_ids.each do |id|
-      m = CabooseRets::Media.find(id)
-      (m.image.styles.keys+[:original]).each { |style| b.objects[m.image.path(style)].rename_to "#{m.image.path(style)}.temp" } if m.image
-      (m.file.styles.keys+[:original]).each  { |style| b.objects[m.file.path(style) ].rename_to "#{m.file.path(style)}.temp"  } if m.file
+      m = CabooseRets::Media.find(id) 
+      (m.image.styles.keys+[:original]).each { |style| b.objects[m.image.path(style)].rename_to "#{m.image.path(style)}.temp" } if m.media_type == 'Photo'
+      b.objects[m.file.path].rename_to "#{m.file.path}.temp" if m.media_type == 'File'
     end
     
     # Rename the assets to their new names
     i = 1
+    j = 1
     media_ids.each do |id|
-      m = CabooseRets::Media.find(id)                      
-      orig_image_name = m.image ? "#{m.image.path}.temp" : nil
-      orig_file_name  = m.file  ? "#{m.image.path}.temp" : nil
-      m.media_order = i      
-      (m.image.styles.keys+[:original]).each { |style| b.objects[orig_image_name.gsub("original", style.to_s)].rename_to m.image.path(style) } if m.image
-      (m.file.styles.keys+[:original]).each  { |style| b.objects[orig_file_name.gsub( "original", style.to_s)].rename_to m.file.path(style)  } if m.file
-      m.save
-      i = i + 1
+      m = CabooseRets::Media.find(id)
+      if m.media_type == 'Photo'        
+        orig_name = "#{m.image.path}.temp"        
+        m.media_order = i      
+        (m.image.styles.keys+[:original]).each { |style| b.objects[orig_name.gsub("original", style.to_s)].rename_to m.image.path(style) }                
+        m.save
+        i = i + 1
+      elsif m.media_type == 'File'        
+        b.objects["#{m.file.path}.temp"].rename_to m.file.path
+        m.media_order = j
+        m.save
+        j = j + 1
+      end
     end
     
     return true

data/app/views/caboose_rets/commercial/admin_edit.html.erb

@@ -202,7 +202,7 @@ attributes = {
 <p>MLS#: <%= p.mls_acct %>
 <p>
 <input type='button' value='< Back' onclick="window.location='/admin/commercial';" />
-<input type='button' value='Images and Files' onclick="window.location='/admin/media/<%= p.mls_acct %>';" />
+<input type='button' value='Images and Files' onclick="window.location='/admin/properties/<%= p.mls_acct %>/media';" />
 <% if !is_custom_property %>
   <input type='button' value='Manually Refresh from MLS' onclick="refresh_property_from_mls('<%= p.mls_acct %>');" />
 <% end %>

data/app/views/caboose_rets/media/admin_property_media.html.erb

@@ -1,6 +1,7 @@
-<h1>Media</h1>
+<h1>Property Images and Files</h1>
 
 <p>MLS#: <%= @property.mls_acct %></p>
+<p><input type='button' value='< Back to Property' onclick="window.location='/admin<%= @property.url %>/edit';" /></p>
 
 <h2>Images</h2>
 <div id='new_image'></div>

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.0.28'
+  VERSION = '0.0.29'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - William Barry