trusty-cms 1.2.28 → 1.2.29

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTY4MWE2MDI0NWQ3NDdmOWFkM2M5MGI2YmM2ZTNmNzkyMzRhNzY0ZA==
+    ZDljNjFiYjdjZTNiNWViMmUxZjYwZjE0NGViNGViZDg4ZTNmMjMzNQ==
   data.tar.gz: !binary |-
-    ZjNiNzAxNDc1MWExM2VhYmMwN2FlYmYyYzA5MmNlYzJhMTRkOWY2YQ==
+    MTdkODliMmQxM2MwZjg1ZGFmMDY5OTU2Y2UwYTBjNmU1MDRhZDJhZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDgxNWQzOTFmMTk3OGY0YzQ0YjE2OGI1OWViYzdhOWNkOGJkZTM1ZjU2YTgx
-    MDU5Nzc1MWU0Yzg2YTg5ZDU3YzZiOWEyMzEyODE1YzkzOTFkZmZjNzEwM2Nm
-    ZmEyZTYxN2IzMDQyYWI0ODZkYzA1ZDQ2NjkzYTBjOWYzMDY1NDk=
+    YTEwNmZiZTY5ZTQ3YzAwZGNmNTdiZjBmNTM4ZTM5OTM2YmQ1NThjYzhiYjk5
+    ZjJmY2UxNjE2MTViYjVkNDBhZmE0ZTc3NTBkYzRlMTNhZjFhNmZlZjA4MzAw
+    ZGFjMThjZjAyZDlhMjZkMmFjYzc3YWVlNWE3MjE4MzliNDRhYmQ=
   data.tar.gz: !binary |-
-    N2VhNmNiZTg5MDAxYTZkYTM0YmU0NTYyMzY0ZGIzYzI2YTEyNDNhMzY1MTEz
-    NTU5Njk0MmU1YTUzYjE2YjZlMDFhOWY2ZTk4OTRmOWU3MDUwZDlkNzFiNzli
-    OTNjNGMzMzFkMmQxMmI1MjcyNDFmYzcwMGZlM2VmYWYxN2UzNDQ=
+    MjNiOWQzZDM4ODRkMTM4MGI2YjExZGIwZDM0ZTE2NTk4ZDE3ZmU4MjAxMzdi
+    NTJmNTEyODc2YWFjYWU3NmI5ZDk4Y2EzMmRkODcwNTZjNjUzNzYxYmExMTFj
+    MjE3NzZhYmE5ZDc3NzkzZGFiNzMxNWUyMzE0MDBlOTg3NWU1ZDI=

data/app/models/page.rb

@@ -179,23 +179,26 @@ class Page < ActiveRecord::Base
     path = clean_path(path) if clean
     my_path = self.path
     if (my_path == path) && (not live or published?)
-      self
+      return self
     elsif (path =~ /^#{Regexp.quote(my_path)}([^\/]*)/)
       slug_child = children.find_by_slug($1)
       if slug_child
-        found = slug_child.find_by_url(path, live, clean) # TODO: set to find_by_path after deprecation
+        found = slug_child.find_by_path(path, live, clean) # TODO: set to find_by_path after deprecation
         return found if found
       end
       children.each do |child|
-        found = child.find_by_url(path, live, clean) # TODO: set to find_by_path after deprecation
+        found = child.find_by_path(path, live, clean) # TODO: set to find_by_path after deprecation
         return found if found
       end
+    end
+    unless slug_child
       file_not_found_types = ([FileNotFoundPage] + FileNotFoundPage.descendants)
       file_not_found_names = file_not_found_types.collect { |x| x.name }
       condition = (['class_name = ?'] * file_not_found_names.length).join(' or ')
       condition = "status_id = #{Status[:published].id} and (#{condition})" if live
-      children.where([condition] + file_not_found_names).first
+      return children.where([condition] + file_not_found_names).first
     end
+    slug_child
   end
   alias_method :find_by_url, :find_by_path
 

data/lib/trusty_cms.rb

@@ -5,7 +5,7 @@ unless defined? TrustyCms::Version
     module Version
       Major = '1'
       Minor = '2'
-      Tiny  = '28'
+      Tiny  = '29'
       Patch = nil # set to nil for normal release
 
       class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 1.2.28
+  version: 1.2.29
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo