caboose-cms 0.3.5 → 0.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjNjZmIxOGIyMjg5YmNhMWMyNDJiZDZmODRmYWEyZmM5ZjI3Njk2Yw==
+    N2MwN2MxYTdkNzc2OWQwZGQ1YzAyOTU5NDc5NTllZmQ0YWNjY2YzNQ==
   data.tar.gz: !binary |-
-    ZDFhNTNkZmE0MGEzZThhODBmZTE3ODYyNGY0ZWY5ODc4YmE5MjQxNw==
+    YjFjZWYwNzU4NDdjYmQwOWNlZTY0NWMwMDVlZWU3ODhkMWY0ZjNjNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDg2MTU0OTRhM2NlNGU3ZjE5MjI4MDBkZWQwMjZiOWE3YzEwOTVlYzI5ZWRi
-    MTExMzI1OGU2YzZiMDA2OGVlNjYwZWNmZTcwYjIxOGE5OGEyNmE2M2Q0OTFk
-    MWZmMzM3MGQwNzFjYmRhZWI0OGEzM2ZjYjQwMDZiZjdjY2ZkMjg=
+    Mzk2Y2E0ZTI0NzIxODQ5MzVmNWI5Njc3YmIxMjhjZWE2NWE5YjRiMGViMzcy
+    ZDY1YTI1MThkMDIwMGE0ZTFiMzM1YWIxNGE4NjkxYjk4ZWFjMTYxYzYxZDMx
+    ODAxOTc5ZmY2OTMwNmJkNzYzZTczMDkwM2EyYTc2ZWZkZmM4NDE=
   data.tar.gz: !binary |-
-    YWU4NjVkOWJhODQxOTNjOWViODQ2OWYzOGJjNDg5NTg1Yjg3NmU5M2VkYTBl
-    NTE0YTViNWRlOGVlODg4NDNlMmRjYTBkMWU1Njg1N2UzNTNmNWY4OWY1Yjg1
-    ZmRiOWRlNmIwZjU1YjcxNTY4YTQxMDYxMDk2NWFhZTBiNmUwY2Q=
+    ODExOGJjMWFhNjk5ZGMzOGU3YmU5ODUyYjRlMTA3YTQwZGRjODEwOTBhNjFm
+    MzQzZjNhMjA1Y2Y4ZWI3N2VjY2U1NmRiMjI1NzkwNWMxZmJhNDRiMzZiZGRh
+    NjRjOTliMDA5MGFhOTAxMzUxNjYwODBkZjU5MTAyNzRkM2I1ZmI=

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

@@ -22,4 +22,4 @@ $(document).ready(function() {
 	    }
 	  })
 	});
-}); 
+}); 

data/app/controllers/caboose/pages_controller.rb

@@ -35,9 +35,7 @@ module Caboose
         return
       end
 
-      #page.content = Caboose.plugin_hook('page_content', page.content)
       page = Caboose.plugin_hook('page_content', page)
-      
       @page = page
       @user = user
       @editmode = !params['edit'].nil? && user.is_allowed('pages', 'edit') ? true : false

data/app/models/caboose/page_bar_generator.rb

@@ -222,7 +222,7 @@ module Caboose
   	
     def sortable_table_headings(cols)
       base_url = url_with_vars
-      base_url << base_url.include?("?") ? "&" : "?"
+      base_url << (base_url.include?("?") ? "&" : "?")
     	str = ''
       
     	# key = sort field, value = text to display

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

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