caboose-cms 0.5.179 → 0.5.180

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTg4ZjU1ZDE1NmM0Y2Q0OTdmMDhmOTRjODIzMjQ1MGU0ZDE4MWYwNQ==
+    MzkxMDQwNTU4NjM2ODY0MGUwNzMxZDhiNzVlMDEwZDEyNDM0NjU4Yw==
   data.tar.gz: !binary |-
-    ZGYyZWMxODBlZmJlMTZiNjI4NDZkM2RlZWRiZTExZmMwZjZjZmQ0OA==
+    MzhiYTRkOTJkY2NiOTlhYmU1NmJiNGNkNmE2M2U0ZjI4YTY5MTRkNw==
 SHA512:
   metadata.gz: !binary |-
-    Y2Y0NWVkMzYyZmRiMDI1ZTYyNDgwN2EzNzI1NDc5YWYyYmQwYzAwMmEzYjg5
-    OWVhMDFlYzE2Y2QwNDViMTlmMWJjN2IzNDY4YjZkMjRhZjFhZTA3OWZlZThh
-    YjYwM2YwZjA5ZTA2NTQ0MGI1N2VhMDNiMzY4OWQ5NDU5Mzg4OTQ=
+    YjgyNWY5NzdjNzU1NzliYTQyNmE2OWY5ZGY2NzdkMWM4ZGQ0Yzk2YWVkYWI3
+    NmFkZmY2ZTBmZGIzMGRmNmE2ZTAzNGU5ODM1NTM5YjhhYjc3NTZjMjE4MmU3
+    YzgzMGVhMDZlMDBjNjk0Yjc2M2Y5NzYwNjA1NTVkZmY5YmUwMTY=
   data.tar.gz: !binary |-
-    ZTJiNjYzMDlmMjEwMTY1NGRiOGRiMTA0NDZlNGU1MGY4YmRhODMzZTM3NWU5
-    YWYwZmFhZDE1ZjkzMzYwMGVlOTZiMWUwMjJmZmRhMWViN2Q4Yzg5MjAwZTZm
-    OTVhZmM1ZDdmMDJjNTRiZTQyMzhjNTZhMWM4Nzg0YmVhMjZmYzY=
+    ZmExMzQ0NzA1ZmFjODY3NWJjMDRlYzc2MWExMzMyOGI5OGJmMjE1YjRkYmUy
+    MWMzYjJiMDdkMDU0MGY2NWI5MGJmNzhkYmJjZmUzNjg1YWU4ZTYyNjEyODI0
+    OGUxZDc2MGNmZDk2YTUzNDJjOTFkMTZjMDZhYmRiN2Q3MWY3OWU=

data/app/controllers/caboose/pages_controller.rb

@@ -26,16 +26,16 @@ module Caboose
         end
         return
       # See if we're on a forwarding domain
-      #elsif !d.primary && d.forward_to_primary
-      #  pd = d.site.primary_domain
-      #  if pd
-      #    url = "#{request.protocol}#{pd.domain}"
-      #    if request.fullpath && request.fullpath.strip.length > 0 && request.fullpath.strip != '/'
-      #      url << request.fullpath
-      #    end
-      #    redirect_to url
-      #    return
-      #  end        
+      elsif d.primary == false && d.forward_to_primary == true
+        pd = d.site.primary_domain
+        if pd
+          url = "#{request.protocol}#{pd.domain}"
+          if request.fullpath && request.fullpath.strip.length > 0 && request.fullpath.strip != '/'
+            url << request.fullpath
+          end
+          redirect_to url
+          return
+        end        
       end
       
       if !page

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.179'
+  VERSION = '0.5.180'
 end

metadata

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