caboose-cms 0.7.18 → 0.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9baf1edd2864a1be3b9e24d0a66d68d07209510
-  data.tar.gz: f5154b7aaed3c72d584f9af8c1f48463019d197e
+  metadata.gz: 00bb4a2e48e9627eee28198c3377b6163ec84a89
+  data.tar.gz: 34fcca5c39a38ac8cf68e6d277270476e4e46fb1
 SHA512:
-  metadata.gz: 5b1390e70d8018860ac722c6169fe2458ecb2aeb16f130033b18baceea04853a625d540d79a0be24d04d26f811a64280f60ea6034cddbe9135e5ec4871874d95
-  data.tar.gz: cb03acae980b4124446c432252b83099ec323edff690a4ccfcf505d3e3b2a811c068742a8d0d22a715089150e9a6b09ce1a634d25ab1bff5022133d2f8a9e909
+  metadata.gz: c49e10f38e901e6a0837829e433a64cab3b2eed708234c04c61f03d178fa300c89ba7b0635f6de2e8ef333fd55a219d820110ca56d84c299f8d7ccaf4be9ed8d
+  data.tar.gz: 412015ee0d678c1b96ba5f46a479971797fb9100fecbda56db33701fbac8ac88200bb180697b3f906485db5d7445b7c0e2e471d1d61d83df63cfb8105444625d

data/app/controllers/caboose/application_controller.rb

@@ -287,7 +287,9 @@ module Caboose
         pd = d.site.primary_domain
         if pd && pd.domain != request.host
           url = "#{request.protocol}#{pd.domain}"
-          if request.fullpath && request.fullpath.strip.length > 0 && request.fullpath.strip != '/'
+          if d.forward_to_uri && d.forward_to_uri.strip.length > 0
+            url << d.forward_to_uri
+          elsif request.fullpath && request.fullpath.strip.length > 0 && request.fullpath.strip != '/'
             url << request.fullpath
           end
           redirect_to url

data/app/controllers/caboose/domains_controller.rb

@@ -41,6 +41,7 @@ module Caboose
           when 'domain'             then d.domain             = value
           when 'under_construction' then d.under_construction = value
           when 'forward_to_primary' then d.forward_to_primary = value
+          when 'forward_to_uri'     then d.forward_to_uri     = value
           when 'primary'            then
             d.primary = value
             Domain.where(:site_id => params[:site_id]).all.each do |d2|

data/app/controllers/caboose/pages_controller.rb

@@ -30,7 +30,9 @@ module Caboose
         pd = d.site.primary_domain
         if pd && pd.domain != request.host
           url = "#{request.protocol}#{pd.domain}"
-          if request.fullpath && request.fullpath.strip.length > 0 && request.fullpath.strip != '/'
+          if d.forward_to_uri && d.forward_to_uri.strip.length > 0
+            url << d.forward_to_uri
+          elsif request.fullpath && request.fullpath.strip.length > 0 && request.fullpath.strip != '/'
             url << request.fullpath
           end
           redirect_to url

data/app/models/caboose/domain.rb

@@ -3,6 +3,6 @@ class Caboose::Domain < ActiveRecord::Base
   self.table_name = "domains"
        
   belongs_to :site, :class_name => 'Caboose::Site'        
-  attr_accessible :id, :site_id, :domain, :primary, :under_construction, :forward_to_primary
+  attr_accessible :id, :site_id, :domain, :primary, :under_construction, :forward_to_primary, :forward_to_uri
       
 end

data/app/models/caboose/schema.rb

@@ -280,7 +280,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :domain             , :string  ],
         [ :primary            , :boolean, { :default => false }],
         [ :under_construction , :boolean, { :default => false }],
-        [ :forward_to_primary , :boolean, { :default => false }]
+        [ :forward_to_primary , :boolean, { :default => false }],
+        [ :forward_to_uri     , :string  ]
       ],
       Caboose::Font => [
         [ :site_id            , :integer ],

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

@@ -25,6 +25,7 @@ user_ids = [] if user_ids.nil?
     <th>Primary</th>
     <th>Under Construction</th>
     <th>Forward to Primary</th>
+    <th>Forward to URI</th>
     <th>Delete</th>
   </tr>
   <% @site.domains.order(:id).all.each do |d| %>
@@ -33,6 +34,7 @@ user_ids = [] if user_ids.nil?
     <td align='center'><input type='radio'    name='primary_domain' <%= d.primary? ? "checked='true'" : '' %> onclick="set_primary_domain(<%= s.id %>, <%= d.id %>);" /></td>
     <td align='center'><input type='checkbox' name='under_construction_<%= d.id %>' <%= d.under_construction ? "checked='true'" : '' %> onclick="set_under_construction(<%= s.id %>, <%= d.id %>, $(this).prop('checked'));" /></td>
     <td align='center'><input type='checkbox' name='forward_to_primary_<%= d.id %>' <%= d.forward_to_primary ? "checked='true'" : '' %> onclick="set_forward_to_primary(<%= s.id %>, <%= d.id %>, $(this).prop('checked'));" /></td>
+    <td align='center'><input type='text'     name='forward_to_uri_<%= d.id %>' value="<%= d.forward_to_uri %>" onchange="set_forward_to_uri(<%= s.id %>, <%= d.id %>, $(this).val());" /></td>
     <td align='center'><input type='button'   value='Delete' onclick="delete_domain(<%= @site.id %>, <%= d.id %>);" /></td>    
   </tr>
   <% end %>
@@ -98,6 +100,15 @@ function set_forward_to_primary(site_id, domain_id, checked)
   });
 }
 
+function set_forward_to_uri(site_id, domain_id, val)
+{
+  $.ajax({
+    url: '/admin/sites/' + site_id + '/domains/' + domain_id,
+    type: 'put',
+    data: { forward_to_uri: val }
+  });
+}
+
 function add_site_membership(site_id, user_id, role)
 {
   $.ajax({

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.18'
+  VERSION = '0.7.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.18
+  version: 0.7.19
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg