caboose-cms 0.3.88 → 0.3.89

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDYzZDI2Zjg4NDFlYTA1MWYwYjUyYTgzZjhkM2FjZWU4YzM1ZGJhNA==
+    ZmYwNzdhZTIzMjlhMzhjMzg0MGZlNTMwODk2M2RkNjc1NDg3MTM4Nw==
   data.tar.gz: !binary |-
-    NGU1MWQ2ZmQxZmQxYzA0MTRmN2M3Nzc5NjhkNmZjOTkwNzY1YjllMw==
+    MzZmMTAxMWUyZjA2YWVmNGE5MTNlYTEyMzI0NjJhOTdjNmFlMmYxZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWIyYmZiNmY3MDczYzEwYzE0MDU1NDViMmFlNWUyNWJkMDU2Yjk1MDY5MmNh
-    ZGQ5MzNiZjdkMmJlYzc4ZGFiOGI4YjVkNTViZTdlMzlkMWZmMDc2ZjE2MzMx
-    YzEzOTNmZTg3ZWY2NjE2MWNhODlhZDI4NDU2OGUyN2I2ZWEzMTM=
+    Zjk2ZTY3MTFjYmRkZTM4MTg2N2Q3YTk0NWFlY2FjYWY4YWZjMGQ3MzRkMDM5
+    NzdiZWM3YjJlYWY4OGFkMTk5MTFiMDM0ZDY4ZWM0NDIxOWEwY2YzM2NjOTIx
+    OTQ2ZjIxYmJmN2U5M2NlZjYzYzcyYjRmZWViODRmN2VmZGQ5MWY=
   data.tar.gz: !binary |-
-    N2Y5MGJkODU0YzQ4YTExYTgzMjdhYmJkYWJhNmI4MzgyN2MxMjQ3YjAxN2Qw
-    ZjlkZTEwYmQ5MWIzOGMxZTI3NzJjNWIxM2Y4YjY0NDcyZWQyNDc4MzNhZmNk
-    ODE5Y2ZlNTg4OGVmMDQxODg0NjYzYTY3ZmQ1NWRjZmRkNWM3N2E=
+    MTY3NGU0M2U2Yzc4MDc3YTkzMjk2YjY3ZjdkNDE0Y2FlODJiZWQ3MzgxYjFi
+    NDk0M2U5ZTA1YzczMjdiNzhkYThjZDUwNzhlZmFiMjg1NTQ3ZmFkMWY1N2Fh
+    OTk4MTJkNzAwZDc0MDhkOGFjZjNhMWQ4NzhiNWQzNGMxM2M5Yzg=

data/app/controllers/caboose/roles_controller.rb

@@ -95,6 +95,22 @@ module Caboose
       render json: { 'redirect' => '/admin/roles' }
     end
     
+    # POST /admin/roles/:id/permissions/:permission_id
+    def add_permission
+      return if !user_is_allowed('roles', 'edit')
+      if !RolePermission.where(:role_id => params[:id], :permission_id => params[:permission_id], ).exists?
+        RolePermission.create(:role_id => params[:id], :permission_id => params[:permission_id])
+      end
+      render :json => true
+    end
+    
+    # DELETE /admin/roles/:id/permissions/:permission_id
+    def remove_permission
+      return if !user_is_allowed('roles', 'edit')
+      RolePermission.where(:role_id => params[:id], :permission_id => params[:permission_id]).destroy_all        
+      render :json => true
+    end
+    
     # GET /admin/roles/options
     def options
       return unless user_is_allowed('roles', 'view')

data/app/controllers/caboose/users_controller.rb

@@ -270,6 +270,22 @@ module Caboose
       render :json => resp
     end
     
+    # POST /admin/users/:id/roles/:role_id
+    def add_to_role
+      return if !user_is_allowed('users', 'edit')
+      if !RoleMembership.where(:user_id => params[:id], :role_id => params[:role_id]).exists?
+        RoleMembership.create(:user_id => params[:id], :role_id => params[:role_id])
+      end
+      render :json => true
+    end
+    
+    # DELETE /admin/users/:id/roles/:role_id
+    def remove_from_role
+      return if !user_is_allowed('users', 'edit')
+      RoleMembership.where(:user_id => params[:id], :role_id => params[:role_id]).destroy_all        
+      render :json => true
+    end
+    
     # GET /admin/users/options
     def options
       return if !user_is_allowed('users', 'view')

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

@@ -3,10 +3,41 @@
 <div id="role_<%= @role.id %>_name"></div>
 <div id="role_<%= @role.id %>_parent_id"></div>
 <div id="role_<%= @role.id %>_description"></div>
+<h3>Members</h3>
+<div id='members'>
+  <table class='data'>
+    <% Caboose::User.reorder("last_name, first_name").all.each do |u| %>
+      <% is_member = Caboose::RoleMembership.where(:role_id => @role.id, :user_id => u.id).exists? %>
+      <tr>
+        <td><input type='checkbox' name='user<%= u.id %>' <%= raw is_member ? "checked='true'" : '' %> onclick="toggle_role(<%= u.id %>, <%= @role.id %>, $(this).prop('checked'));" /></td>
+        <td><%= u.first_name %> <%= u.last_name %> (<%= u.email %>)</td>
+      </tr>
+    <% end %>
+  </table>
+</div>
+<h3>Permissions</h3>
+<div id='permissions'>
+  <table class='data'>
+    <% Caboose::Permission.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>
+        <td><%= p.resource %> - <%= p.action %></td>
+      </tr>
+    <% end %>
+  </table>
+</div>
 <div id="role_<%= @role.id %>_members"></div>
 <div id="role_<%= @role.id %>_permissions"></div>
 <div id="message"></div>
 
+<% content_for :caboose_css do %>
+<style type='text/css'>
+#content input[type=checkbox] { position: relative; }
+#members { height: 400px; overflow-y: scroll; margin-bottom: 20px; }
+#permissions { height: 400px; overflow-y: scroll; margin-bottom: 20px; }
+</style>
+<% end %>
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
@@ -25,84 +56,31 @@ $(document).ready(function() {
     delete_url: 'delete /admin/roles/<%= @role.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { 
-        name: 'parent_id',
-        nice_name: 'Parent',
-        type: 'select',
-        value: <%= @role.parent_id %>,
-        text: "<%= @role.parent.nil? ? '[No parent]' : @role.parent.name %>",
-        show_controls: true,
-        loading_message: 'Getting roles...',
-        options_url: '/admin/roles/options',
-        width: 590,
-        message: 'message'
-      },    
+      { name: 'parent_id'   , nice_name: 'Parent'      , type: 'select', value: <%= @role.parent_id %>, text: "<%= @role.parent.nil? ? '[No parent]' : @role.parent.name %>", show_controls: true, loading_message: 'Getting roles...', options_url: '/admin/roles/options', width: 590, message: 'message' },    
       { name: 'name'        , nice_name: 'Name'        , type: 'text' , value: "<%= @role.name %>"        , width: 590 , message: 'message' },
-      { name: 'description' , nice_name: 'Description' , type: 'text' , value: "<%= @role.description %>" , width: 590 , message: 'message' },
-      { 
-        name: 'members',
-        nice_name: 'Members',
-        type: 'checkbox-multiple',
-        value: <%= @role.users.collect{|u| u.id}.to_json %>,
-        text: "<%= raw @role.users.order('last_name, first_name').collect{|u| "#{u.first_name} #{u.last_name}"}.join('<br />') %>",
-        loading_message: 'Getting users...',
-        options_url: '/admin/users/options',
-        width: 590,
-        message: 'message'
-      },
-      { 
-        name: 'permissions',
-        nice_name: 'Permissions',
-        type: 'checkbox-multiple',
-        value: <%= @role.permissions.collect{|p| p.id}.to_json %>,
-        text: "<%= raw @role.permissions.order('resource, action').collect{|p| "#{p.resource}_#{p.action}"}.join('<br />') %>",
-        loading_message: 'Getting permissions...',
-        options_url: '/admin/permissions/options',
-        width: 590,
-        message: 'message'
-      }
+      { name: 'description' , nice_name: 'Description' , type: 'text' , value: "<%= @role.description %>" , width: 590 , message: 'message' }      
     ],
     on_load: function() { modal.autosize(); }
+  });  
+});
+
+function toggle_role(user_id, role_id, checked)
+{
+  $.ajax({
+    url: '/admin/users/' + user_id +'/roles/' + role_id,
+    type: checked ? 'post' : 'delete',    
+    success: function(resp) { }
   });
+}
 
-  /*var user = new Model({
-    name: 'Role',
-    id: <%= @role.id %>,
-    listing_url: 'get /admin/roles',
-    update_url: 'put /admin/roles/<%= @role.id %>',
-    delete_url: 'delete /admin/roles/<%= @role.id %>',
-    attributes: [
-      { 
-        name: 'parent_id',
-        nice_name: 'Parent',
-        type: 'select',
-        value: <%= @role.parent_id %>,
-        text: "<%= @role.parent.nil? ? '[No parent]' : @role.parent.name %>",
-        show_controls: true,
-        loading_message: 'Getting roles...',
-        options_url: '/admin/roles/options' 
-      },    
-      { name: 'name'        , type: 'text' , value: "<%= @role.name %>" },
-      { name: 'description' , type: 'text' , value: "<%= @role.description %>" },
-      { 
-        name: 'members',
-        type: 'checkbox-multiple',
-        value: <%= @role.users.collect{|u| u.id}.to_json %>,
-        text: "<%= raw @role.users.order('last_name, first_name').collect{|u| "#{u.first_name} #{u.last_name}"}.join('<br />') %>",
-        loading_message: 'Getting users...',
-        options_url: '/admin/users/options',
-      },
-      { 
-        name: 'permissions',
-        type: 'checkbox-multiple',
-        value: <%= @role.permissions.collect{|p| p.id}.to_json %>,
-        text: "<%= raw @role.permissions.order('resource, action').collect{|p| "#{p.resource}_#{p.action}"}.join('<br />') %>",
-        loading_message: 'Getting permissions...',
-        options_url: '/admin/permissions/options',
-      }
-    ]
-  });*/
-});
+function toggle_permission(permission_id, role_id, checked)
+{
+  $.ajax({
+    url: '/admin/roles/' + role_id +'/permissions/' + permission_id,
+    type: checked ? 'post' : 'delete',    
+    success: function(resp) { }
+  });
+}
 
 </script>
 <% end %>

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

@@ -8,6 +8,14 @@ pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/
 <p><div id='user_<%= @edituser.id %>_last_name'  ></div></p>
 <p><div id='user_<%= @edituser.id %>_username'   ></div></p>
 <p><div id='user_<%= @edituser.id %>_email'      ></div></p>
+<div id='roles'>
+<table class='data'>
+<% Caboose::Role.flat_tree.each do |r| %>
+<% is_member = Caboose::RoleMembership.where(:role_id => r.id, :user_id => @edituser.id).exists? %>
+<tr><td><input type='checkbox' name='role<%= r.id %>' <%= is_member ? "checked='true'" : '' %> onclick="toggle_role(<%= @edituser.id %>, <%= r.id %>, $(this).prop('checked'));" /></td><td><%= r.name %></td></tr>
+<% end %>
+</table>
+</div>
 <div id='message'></div>
 <div id='controls'>
 <input type='button' value='Back'           onclick="window.location='/admin/users';" />
@@ -15,6 +23,12 @@ pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/
 <input type='button' value='Delete User'    onclick="delete_user(<%= @edituser.id %>);" />
 </div>
 
+<% content_for :caboose_css do %>
+<style type='text/css'>
+#content input[type=checkbox] { position: relative; }
+#roles { height: 200px; overflow-y: scroll; margin-bottom: 20px; }
+</style>
+<% end %>
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
@@ -61,6 +75,15 @@ function delete_user(user_id, confirm)
   });
 }
 
+function toggle_role(user_id, role_id, checked)
+{
+  $.ajax({
+    url: '/admin/users/' + user_id +'/roles/' + role_id,
+    type: checked ? 'post' : 'delete',    
+    succes: function(resp) { }
+  });
+}
+
 </script>
 <% end %>
 

data/config/routes.rb

@@ -33,6 +33,9 @@ Caboose::Engine.routes.draw do
   post    "admin/users"                     => "users#create"
   delete  "admin/users/:id"                 => "users#destroy"
   
+  post    "admin/users/:id/roles/:role_id"  => "users#add_to_role"  
+  delete  "admin/users/:id/roles/:role_id"  => "users#remove_from_role"
+  
   get     "admin/roles"                   => "roles#index"
   get     "admin/roles/options"           => "roles#options"
   get     "admin/roles/new"               => "roles#new"
@@ -41,6 +44,9 @@ Caboose::Engine.routes.draw do
   post    "admin/roles"                   => "roles#create"
   delete  "admin/roles/:id"               => "roles#destroy"
   
+  post    "admin/roles/:id/permissions/:permission_id"  => "roles#add_permission"  
+  delete  "admin/roles/:id/permissions/:permission_id"  => "roles#remove_permission"
+  
   get     "admin/permissions"             => "permissions#index"
   get     "admin/permissions/options"     => "permissions#options"
   get     "admin/permissions/new"         => "permissions#new"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.88'
+  VERSION = '0.3.89'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.88
+  version: 0.3.89
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails