curupira 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f14fa682e08b79b040066b77987f1e349d6f7fc
-  data.tar.gz: 1e079aeade659aa49a9a845685bb729ab32fd547
+  metadata.gz: 8ca4be82e390515697d16daa359b5a036d5d7189
+  data.tar.gz: 49744e964b4f0572f47371659ae0cba69b503237
 SHA512:
-  metadata.gz: 4d0748f95cd07df56e5c71e7010a6d5c8c0fc3ee87431916e7892ef623b7d2acc49e06871044ab302739a5bdebd86c51eb1131ac4b9bc875be19cc87f1b29b31
-  data.tar.gz: d22e13945075d7f2e9cd8c5725140c6f2884e57bc4134bd5c0bd654dbf5506770c68c8cb737a6d2735438ee565f7cdc8c49350684b39a72cbe71612739497597
+  metadata.gz: 21fc605d450e4b1ec20d09e7014c29a7516b328efb814f442a187db99c0aaa1bff6b341cb14bcd8750351c8939c598d820adb93767008b27b26cecf25ccaf8e1
+  data.tar.gz: a8416b6983a96add5385eb7cb806442ad6d5878e1f5e7cff48260c9abec3ab94db3cbe2d90d976b87444d5336a9e298156358424302442edd26a9aaf234c8ba5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    curupira (0.1.2)
+    curupira (0.1.3)
       cocoon
       jquery-rails
       rails (~> 4.2.0)

data/app/controllers/curupira/users_controller.rb

@@ -39,6 +39,12 @@ class Curupira::UsersController < Curupira::AuthorizedController
     end
   end
 
+  def permission
+    @user = User.find(params[:user_id])
+    @group_user = @user.group_users.find_by(group_id: params[:group_id])
+    @group = @group_user.group
+  end
+
   private
 
   def user_params

data/app/views/curupira/users/_group_user_fields.html.erb

@@ -4,17 +4,8 @@
   <% else %>
     <%= f.object.user_group.name %>
   <% end %>
-
-  <div style="margin: 50px">
-    <h4>Perfis</h4>
-    <%= f.fields_for :role_group_users do |role_group_user| %>
-      <%= render "role_group_user_fields", f: role_group_user %>
-    <% end %>
   
-    <div class="links">
-      <%= link_to_add_association 'Adicionar Permissão', f, :role_group_users %>
-    </div>
-
+  <div class="links">
     <%= link_to_remove_association "Remover", f %>
   </div>
 </div>

data/app/views/curupira/users/_role_group_user_fields.html.erb

@@ -1,7 +1,7 @@
 <div class="nested-fields">
   <% if f.object.role.blank? || f.object.role.active? %>
 
-    <%= f.select :role_id, active_roles_select_options %>
+    <%= f.select :role_id, active_role_groups_select_options(@group) %>
   <% else %>
     <%= f.object.role.name %>
   <% end %>

data/app/views/curupira/users/permission.html.erb

@@ -0,0 +1,20 @@
+<h2> Adicionar perfis ao Usuário </h2>
+
+Usuário <%= @user.name %>
+
+Grupo <%= @group.name %>
+
+<%= form_for @user do |f| %>
+  <div class="group_users">
+    <h3>Perfil</h3>
+
+	<%= f.fields_for :role_group_users do |b| %>
+		<%= render "role_group_user_fields", f: b %>
+	<% end %>
+
+    <div class="links">
+      <%= link_to_add_association 'Adicionar perfil', f, :role_group_users %>
+    </div>
+  </div>
+<% end %>
+

data/app/views/curupira/users/show.html.erb

@@ -16,7 +16,7 @@
 
   <ul>
     <% @user.group_users.each do |group_user| %>
-      <li><%= group_user.group.name %> <%= link_to "Editar grupo", edit_user_path(@user) %>
+      <li><%= group_user.group.name %> <%= link_to "Vincular perfis do grupo", user_permission_path(@user,group_user.group) %>
         <% group_user.role_group_users.each do |role_group_user|%>
           <p><%= role_group_user.role.name %></p>
         <% end %>

data/lib/curupira/rails/routes.rb

@@ -2,7 +2,10 @@ module ActionDispatch::Routing
   class Mapper
     def curupira_routes
       scope module: 'curupira' do
-        resources :users, except: :destroy
+        resources :users, except: :destroy do
+          get 'groups/:group_id/roles', to: 'users#permission',as: 'permission', action: :permission, controller: :users
+        end
+        
         resources :groups, except: :destroy
         resources :roles, except: :destroy
         resource :session, only: [:new, :create] do

data/lib/curupira/version.rb

@@ -1,3 +1,3 @@
 module Curupira
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/generators/curupira/install/model_generators_helper.rb

@@ -174,6 +174,7 @@ module Curupira
           has_many :groups, through: :group_users
           has_many :role_group_users, through: :group_users
           accepts_nested_attributes_for :group_users, reject_if: :all_blank, allow_destroy: :true
+          accepts_nested_attributes_for :role_group_users, reject_if: :all_blank, allow_destroy: :true
           
           scope :all_belonging_to, -> (user) { includes(group_users: :group).where(groups: { id: user.groups }) }
         CONTENT

data/spec/dummy/app/models/user.rb

@@ -5,6 +5,7 @@ class User < ActiveRecord::Base
   has_many :groups, through: :group_users
   has_many :role_group_users, through: :group_users
   accepts_nested_attributes_for :group_users, reject_if: :all_blank, allow_destroy: :true
+  accepts_nested_attributes_for :role_group_users, reject_if: :all_blank, allow_destroy: :true
   
   scope :all_belonging_to, -> (user) { includes(group_users: :group).where(groups: { id: user.groups }) }
 end