caboose-cms 0.9.202 → 0.9.203

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594ecd258a29ebf021cb1027118e4d5bdd14053e14a510dabe5984af1d06e01c
-  data.tar.gz: 4431d98ed2160f9a81c90d9c276c280d4e34f24cbb51facd068063420b8278db
+  metadata.gz: 1725d5a46f0948469bc5bbb94e701c1ad6fe6b0d34ac4cd2454a2382be0074a0
+  data.tar.gz: c674a21714a52e1f1f8d29b9a62d436e01694c7150485f342b37f0d3e503627b
 SHA512:
-  metadata.gz: eddf552c561fb568d8f17ae458494756d50abcbcd5f7963a9f779a38a1783cfc2de30d96abc515f39fe2a763550521462a34318de9d108e2a8bb9643c3f83d17
-  data.tar.gz: 70399d22a0dc430571772bf0c8c2c573cc627c93402243d12fabe887e466eb05304f66647be3c1edd2d1d4e41a99bd0fb78658ae596db09fd255d222dce7865a
+  metadata.gz: 1b4e7c09ffbd75fdbddafd309c4a24b3e86f25c6d9dc1f2b4645651b76ac4c52e58e29ef1708fd31dda2a7b33e335292ef49f51f26005032b4be82467b6bb2e9
+  data.tar.gz: 30c8c2285347b66aedac3036eb0e437afb5cabeab016df70785202613fb30e487ad33aaf0457091cee73af26ab71cac46f86f0667d9fd70b2ecba6be98c73256

data/app/assets/javascripts/caboose/admin_media_index.js

@@ -24,8 +24,7 @@ MediaController.prototype = {
   init: function(params) {
     var that = this;
     for (var i in params)
-      this[i] = params[i];
-            
+      this[i] = params[i];      
     $("#uploader")
       .empty()
       .append($('<p/>')
@@ -39,6 +38,7 @@ MediaController.prototype = {
   
   refresh: function()
   {
+    //console.log("REFRESHING EVERYTHING");
     var that = this;
     that.refresh_categories();
     that.refresh_media();
@@ -64,6 +64,7 @@ MediaController.prototype = {
   
   refresh_media: function() 
   {
+    //console.log("REFRESHING MEDIA");
     var that = this;
     $.ajax({
       url: '/admin/media/json',
@@ -80,7 +81,6 @@ MediaController.prototype = {
 
   change_sort_order: function(list) {
     var that = this;
-   // console.log(list.toString());
     $.ajax({
       url: '/admin/media-categories/' + that.cat_id + '/sort-order',
       type: 'put',
@@ -162,7 +162,8 @@ MediaController.prototype = {
 		    flash_swf_url: '../../js/Moxie.swf', // Flash settings		
 		    silverlight_xap_url: '../../js/Moxie.xap', // Silverlight settings
         init: {
-          BeforeUpload: function(up, file) {        
+          BeforeUpload: function(up, file) {
+            //console.log("BeforeUpload");   
             //up.settings.multipart_params["Content-Type"] = file.type;
             $.ajax({
               url: '/admin/media/pre-upload',
@@ -175,14 +176,16 @@ MediaController.prototype = {
               success: function(resp) {},
               async: false          
             });
-            controller.refresh();
+          //  controller.refresh();
           },
           FileUploaded: function(ip, file)
           {
-            that.refresh();            
+            //console.log("FileUploaded"); 
+           // that.refresh();            
           },          
           UploadComplete: function(up, files) {
-            that.refresh();
+            //console.log("UploadComplete"); 
+            that.refresh_media();
             that.ajax_count = 0;
             if (that.uploader)
             {

data/app/controllers/caboose/sites_controller.rb

@@ -9,7 +9,8 @@ module Caboose
     end
 
     def sitemap
-      @protocol = request && request.protocol ? request.protocol : 'http'
+      @protocol = request && request.protocol ? request.protocol : 'http://'
+      @protocol = 'https://' if request && request.env['HTTPS'] == 'on'
       begin
         view = ActionView::Base.new(ActionController::Base.view_paths)
         str = view.render(:partial => "../../app/views/caboose/blocks/#{@site.name}/sitemap", :locals => {:site => @site, :protocol => @protocol})

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.202'
+  VERSION = '0.9.203'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.202
+  version: 0.9.203
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg