caboose-cms 0.8.15 → 0.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa3fb1432258306db56b298525446cec698aef03
-  data.tar.gz: af42acc488025424bde48a48764fb0f26f429289
+  metadata.gz: b694873b2acdf08025a9ff83ce34d097e00c0c87
+  data.tar.gz: 607782e94412ee709653e88b2ad9662e11592f17
 SHA512:
-  metadata.gz: 7de9d53efb3a7144a5cca592a972d866f0b67c1654f650b98a37021b80108c3cf8bd6ee92736f25e42dd450d74b17162b6d82850ee51b7a88dc81308107a8f14
-  data.tar.gz: d54163fb97e4ad21788e95524576e7ae6882fada323db3090740b9105b59a0c9d98fa694efe1c3e77b3eb05e99e15cbf510432d22d5d5558ead87bc5bc51f654
+  metadata.gz: 350418a458a5c6542bb59aa9bdbbdca4d9c0e2613199d9bf3f2b1bf2f77ea4171ee128bd35987744a4aac90d38fd4ac8d7808f17bed01e1a748f81a71a69b9d4
+  data.tar.gz: 59b14e3cf1cba296916232aa48db9e9406a00050cc4169f15134c8fe2ee18820de6670a55c415c0f7ea9e95189f2114fbfc562415f0e4129242c5866a9167eb1

data/app/controllers/caboose/application_controller.rb

@@ -187,17 +187,25 @@ module Caboose
     # on the given resource.
     # Redirects to login if not logged in.
     # Redirects to error page with message if not allowed.
-    def user_is_allowed(resource, action)
-      if (!logged_in?)
-        redirect_to "/login?return_url=" + URI.encode(request.fullpath)
+    def user_is_allowed(resource, action, json = false)
+      if !logged_in?
+        if json
+          render :json => false
+        else
+          redirect_to "/login?return_url=" + URI.encode(request.fullpath)
+        end
         return false
       end
       
       @user = logged_in_user
-      if (!@user.is_allowed(resource, action))
-        @error = "You don't have permission to " + action + " " + resource
-        @return_url = request.fullpath
-        render :template => "caboose/extras/error"
+      if !@user.is_allowed(resource, action)        
+        if json
+          render :json => false
+        else
+          @error = "You don't have permission to " + action + " " + resource
+          @return_url = request.fullpath
+          render :template => "caboose/extras/error"
+        end
         return false
       end
       
@@ -213,17 +221,25 @@ module Caboose
     # useful for creating super-readable code, for example:
     #   > return unless user_is_allowed_to 'edit', 'pages'
     # Even your mom could read that code.
-    def user_is_allowed_to(action, resource)
+    def user_is_allowed_to(action, resource, json = false)
       unless logged_in?
-        redirect_to "/login?return_url=" + URI.encode(request.fullpath)
+        if json
+          render :json => { :error => 'Not logged in.' }
+        else
+          redirect_to "/login?return_url=" + URI.encode(request.fullpath)
+        end
         return false
       end
 
       @user = logged_in_user
       unless @user.is_allowed(resource, action)
-        @error = "You don't have permission to #{action} #{resource}"
-        @return_url = request.fullpath
-        render :template => "caboose/extras/error"
+        if json
+          render :json => { :error => "You don't have permission." }
+        else          
+          @error = "You don't have permission to #{action} #{resource}"
+          @return_url = request.fullpath
+          render :template => "caboose/extras/error"
+        end
         return false
       end
       return true

data/app/models/caboose/page_custom_field_value.rb

@@ -14,7 +14,7 @@ class Caboose::PageCustomFieldValue < ActiveRecord::Base
   def duplicate(page_id, page_custom_field_id)
     v = Caboose::PageCustomFieldValue.create(
       :page_id              => page_id,
-      :page_custom_field_id => pag_custom_field_id,
+      :page_custom_field_id => page_custom_field_id,
       :key                  => self.key,
       :value                => self.value,
       :sort_order           => self.sort_order

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.15'
+  VERSION = '0.8.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.15
+  version: 0.8.16
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg