caboose-cms 0.9.119 → 0.9.120

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a304232d57c41a14e954584d564f0b37af0555e
-  data.tar.gz: 1433765ace9cbf72fbae46a4d96b1538d575fb1d
+  metadata.gz: cb5683a980021f404392a2f015b989295670fa6e
+  data.tar.gz: 346da7005b08035b52ec6e16e3a399d30513d38b
 SHA512:
-  metadata.gz: 23300deba3dbfe3d503e62a11ee1e1eb5a03010d05c591a81a248cb8cef800c7ec979c862923d7585774db327dade2c9235e4dc2303a470de123da3e80afb4e2
-  data.tar.gz: 9612c59ad4efc7fc6d3885562d8921296378837d4f06b102a4f0307d66c96ea27defe90eb485395fe6f56948951cf8ea73bb794151ed3eeaf3f3c865f2834e9f
+  metadata.gz: fabbf562e74acb49526d3d1e2e1244b588e37978c8a55c0236ef6baf6538b8fce103fe1d537fe37309435e2c40de874e9f81ff5949fa5a9c1ec8f945540b2b85
+  data.tar.gz: 5daf70440e4f8dd445b0035b420112ea65fcea692d64cb4d4a8d4e19f3aca566a0e0338ba78edb78c99297863e18ea10672a19aaefa7a952c517c323e8c000f3

data/app/models/caboose/permission.rb

@@ -1,10 +1,11 @@
 
 class Caboose::Permission < ActiveRecord::Base
   self.table_name = "permissions"
-  #has_and_belongs_to_many :roles
+
+  belongs_to :site
   has_many :role_permissions
-  has_many :roles, :through => :role_permissions  
-  attr_accessible :action, :resource
+  has_many :roles, :through => :role_permissions
+  attr_accessible :action, :resource, :site_id
   
   def self.allow(role_id, resource, action)    
     role = Role.find(role_id)
@@ -13,4 +14,4 @@ class Caboose::Permission < ActiveRecord::Base
     role.permissions.push(perm)
     role.save
   end
-end
+end

data/app/models/caboose/schema.rb

@@ -558,7 +558,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::Permission => [
         [ :resource , :string ],
-        [ :action   , :string ]
+        [ :action   , :string ],
+        [ :site_id   , :integer ]
       ],
       Caboose::Post => [
         [ :site_id              , :integer    ],

data/app/views/caboose/roles/edit.html.erb

@@ -28,7 +28,8 @@
 <h3>Permissions</h3>
 <div id='permissions'>
   <table class='data'>
-    <% Caboose::Permission.reorder("resource, action").all.each do |p| %>
+    <% where = @site.is_master ? "(id is not null)" : "(site_id is null OR site_id = #{@site.id})" %>
+    <% Caboose::Permission.where(where).reorder("resource, action").all.each do |p| %>
       <% has_permission = Caboose::RolePermission.where(:role_id => @role.id, :permission_id => p.id).exists? %>
       <tr>
         <td><input type='checkbox' name='perm<%= p.id %>' <%= raw has_permission ? "checked='true'" : '' %> onclick="toggle_permission(<%= p.id %>, <%= @role.id %>, $(this).prop('checked'));" /></td>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.119'
+  VERSION = '0.9.120'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.119
+  version: 0.9.120
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg