caboose-cms 0.9.111 → 0.9.112

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae975fc6540c5307b60808ec36170f98686042d3
-  data.tar.gz: 2728f1f27b4cecbc6f24c32ab936dafd3cb64eb3
+  metadata.gz: 6a12fe36edfec025f81b19ddff158f17e3797ed9
+  data.tar.gz: 302610679fef38a06838d9f861296112ab09aea2
 SHA512:
-  metadata.gz: 39c949e9f522d50341c812c8aa5e705c6e46ebd7c1d8648a8dd32ec60505e0114f9a847cbe1a519c4bc3dc1758e6d85cc664177d98d6af56a08a6efaa85bfd41
-  data.tar.gz: e23da55d239afbc51ca729f30f1386f70b3ddcaa87630b1207ea737c007ee9a8d9f76301cfd316b0dd6d9ff67cadb9fa2bc495e3210eb2700ae2532906a65aac
+  metadata.gz: ec64cb7eba7a0b11218ca69e3a219b73896252cbd809a7c417097d78249f6ee4ea6afa9cc09a2669bb6c2720f02e03f5c0b49c031c996fad78c646b369538853
+  data.tar.gz: 70bed2976b44ae24c84a287ac8651b3323b188e580c0a53ba0ddb26a5274f4e7c2a02540fa735cfcb41029f9b4ab5967c93430af81b24e66c85246aae18873e7

data/app/controllers/caboose/categories_controller.rb

@@ -11,7 +11,7 @@ module Caboose
       
       @top_cat = Caboose::Category.where("site_id = ? and parent_id is null", @site.id).first      
       if @top_cat.nil?
-        @top_cat = Caboose::Category.create(:site_id => @site.id, :name => 'All Products', :url => '/')
+        @top_cat = Caboose::Category.create(:site_id => @site.id, :name => 'All Products', :url => '/products', :slug => 'products', :status => 'Active')
       end
       render :layout => 'caboose/admin'
     end

data/app/controllers/caboose/pages_controller.rb

@@ -18,7 +18,7 @@ module Caboose
     def show
       
       # Find the page with an exact URI match 
-      page = Page.page_with_uri(request.host_with_port, request.fullpath, false)            
+      page = Page.page_with_uri(request.host_with_port, request.fullpath, false)
       
       # Make sure we're not under construction or on a forwarded domain
       d = Caboose::Domain.where(:domain => request.host_with_port).first
@@ -43,7 +43,11 @@ module Caboose
           end
           redirect_to url
           return
-        end        
+        end
+      elsif d.primary == false && !d.forward_to_uri.blank? && request.fullpath == '/'
+        url = "#{request.protocol}#{d.domain}#{d.forward_to_uri}"
+        redirect_to url
+        return
       end
       
       if !page

data/app/controllers/caboose/post_custom_fields_controller.rb

@@ -61,7 +61,8 @@ module Caboose
           when 'name'          then f.name           = value
           when 'field_type'    then f.field_type     = value
           when 'default_value' then f.default_value  = value
-          when 'options'       then f.options        = value              
+          when 'options'       then f.options        = value
+          when 'options_url'   then f.options_url    = value             
         end
       end
       resp.success = save && f.save      
@@ -93,7 +94,6 @@ module Caboose
     # @route DELETE /admin/post-custom-fields/:id
     def admin_delete
       return if !user_is_allowed('postcustomfields', 'edit')
-
       if params[:id] == 'bulk'      
         params[:model_ids].each do |fid|
           PostCustomFieldValue.where(:post_custom_field_id => fid).destroy_all

data/app/models/caboose/post_custom_field.rb

@@ -10,6 +10,7 @@ class Caboose::PostCustomField < ActiveRecord::Base
     :field_type        ,
     :default_value     ,
     :options           ,
+    :options_url       ,
     :sort_order
     
   FIELD_TYPE_TEXT = 'text'

data/app/models/caboose/schema.rb

@@ -588,6 +588,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :key               , :string  ],
         [ :name              , :string  ],
         [ :field_type        , :string  ],
+        [ :options_url       , :string  ],
         [ :default_value     , :text    ],
         [ :options           , :text    ],
         [ :sort_order        , :integer  , { :default => 0 }]

data/app/views/caboose/post_custom_fields/admin_edit.html.erb

@@ -7,7 +7,8 @@ f = @post_custom_field
 <p><div id='postcustomfield_<%= f.id %>_key'           ></div></p>    
 <p><div id='postcustomfield_<%= f.id %>_name'          ></div></p>    
 <p><div id='postcustomfield_<%= f.id %>_field_type'    ></div></p>    
-<p><div id='postcustomfield_<%= f.id %>_default_value' ></div></p>    
+<p><div id='postcustomfield_<%= f.id %>_default_value' ></div></p>
+<p><div id='postcustomfield_<%= f.id %>_options_url'   ></div></p>  
 <p><div id='postcustomfield_<%= f.id %>_options'       ></div></p>    
          
 <div id='message'></div>
@@ -30,7 +31,8 @@ $(document).ready(function() {
       { name: 'key'           , nice_name: 'Key'           , type: 'text'     , value: <%= raw Caboose.json(f.key           ) %>, width: 800 },           
       { name: 'name'          , nice_name: 'Name'          , type: 'text'     , value: <%= raw Caboose.json(f.name          ) %>, width: 800 },    
       { name: 'field_type'    , nice_name: 'Type'          , type: 'select'   , value: <%= raw Caboose.json(f.field_type    ) %>, width: 800  , options_url: '/admin/post-custom-fields/field-type-options' },    
-      { name: 'default_value' , nice_name: 'Default Value' , type: 'text'     , value: <%= raw Caboose.json(f.default_value ) %>, width: 800 },    
+      { name: 'default_value' , nice_name: 'Default Value' , type: 'text'     , value: <%= raw Caboose.json(f.default_value ) %>, width: 800 },
+      { name: 'options_url' , nice_name: 'Options URL' , type: 'text'     , value: <%= raw Caboose.json(f.options_url ) %>, width: 800 },       
       { name: 'options'       , nice_name: 'Options'       , type: 'textarea' , value: <%= raw Caboose.json(f.options       ) %>, width: 800 , height: 200 }                  
     ]
   });  

data/app/views/caboose/posts/admin_edit_general.html.erb

@@ -52,7 +52,8 @@ $(document).ready(function() {
           type:      <%= raw Caboose.json(f.field_type) %>,
           value:     <%= raw Caboose.json(fv.value) %>,
           width:     600
-          <% if f.field_type == 'select' %>, options_url: '/admin/post-custom-fields/<%= f.id %>/options'<% end %>
+          <% if f.field_type == 'select' && !f.options_url.blank? %>, options_url: '<%= f.options_url %>'<% end %>
+          <% if f.field_type == 'select' && f.options_url.blank? %>, options_url: '/admin/post-custom-fields/<%= f.id %>/options'<% end %>
         }                    
       ]
     });

data/app/views/layouts/caboose/admin.html.erb

@@ -44,6 +44,8 @@ end
 <head>
 <meta charset="utf-8" />
 <title>Caboose Admin</title>	
+<link rel="icon" type="image/png" href="https://cabooseit.s3.amazonaws.com/caboose_32.png" sizes="32x32">
+<link rel="icon" type="image/png" href="https://cabooseit.s3.amazonaws.com/caboose_16.png" sizes="16x16">
 <%= raw css %>
 <%= csrf_meta_tags %>
 </head>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.111'
+  VERSION = '0.9.112'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.111
+  version: 0.9.112
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg