integrated permission removal path

app/controllers/permissions_controller.rb

@@ -8,7 +8,7 @@ class PermissionsController < ApplicationController
   # GET /permissions.json
   # GET /permissions.json
   def index
   def index
     # return permissions for nilm specified by nilm_id
     # return permissions for nilm specified by nilm_id
-    @permissions = @nilm.permissions
+    @permissions = @nilm.permissions.includes(:user, :user_group)
   end
   end
 
 
   # POST /permissions
   # POST /permissions

app/models/permission.rb

@@ -25,6 +25,16 @@ class Permission < ApplicationRecord
     end
     end
   end
   end
 
 
+  def target_type
+    if self.user_id?
+      return 'user'
+    elsif self.user_group_id?
+      return 'group'
+    else
+      return 'unknown'
+    end
+  end
+
   def self.json_keys
   def self.json_keys
     [:id, :nilm_id, :role]
     [:id, :nilm_id, :role]
   end
   end

app/views/permissions/_permission.json.jbuilder

-json.extract! permission, *Permission.json_keys
-json.name permission.target_name

app/views/permissions/create.json.jbuilder

 json.data do
 json.data do
   json.extract! @permission, *Permission.json_keys
   json.extract! @permission, *Permission.json_keys
-  json.name @permission.target_name
+  json.target_name @permission.target_name
+  json.target_type @permission.target_type
 end
 end
 
 
 json.partial! "helpers/messages", service: @service
 json.partial! "helpers/messages", service: @service

app/views/permissions/index.json.jbuilder

 json.array!(@permissions) do |permission|
 json.array!(@permissions) do |permission|
   json.extract! permission, *Permission.json_keys
   json.extract! permission, *Permission.json_keys
-  json.name permission.target_name
+  json.target_name permission.target_name
+  json.target_type permission.target_type
+  json.removable permission.user_id!=current_user.id
 end
 end