Merge pull request #1257 from suraj-webkul/Issue#1196

Issue #1196 fixed.

Author: devansh-webkul

packages/Webkul/Admin/src/DataGrids/Contact/PersonDataGrid.php

@@ -122,20 +122,24 @@ public function addColumns()
      */
     public function prepareActions()
     {
-        $this->addAction([
-            'title'  => trans('ui::app.datagrid.edit'),
-            'method' => 'GET',
-            'route'  => 'admin.contacts.persons.edit',
-            'icon'   => 'pencil-icon',
-        ]);
-
-        $this->addAction([
-            'title'        => trans('ui::app.datagrid.delete'),
-            'method'       => 'DELETE',
-            'route'        => 'admin.contacts.persons.delete',
-            'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => trans('admin::app.contacts.persons.person')]),
-            'icon'         => 'trash-icon',
-        ]);
+        if (bouncer()->hasPermission('contacts.persons.edit')) {
+            $this->addAction([
+                'title'  => trans('ui::app.datagrid.edit'),
+                'method' => 'GET',
+                'route'  => 'admin.contacts.persons.edit',
+                'icon'   => 'pencil-icon',
+            ]);
+        }
+
+        if (bouncer()->hasPermission('contacts.persons.delete')) {
+            $this->addAction([
+                'title'        => trans('ui::app.datagrid.delete'),
+                'method'       => 'DELETE',
+                'route'        => 'admin.contacts.persons.delete',
+                'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => trans('admin::app.contacts.persons.person')]),
+                'icon'         => 'trash-icon',
+            ]);
+        }
     }
 
     /**

packages/Webkul/Admin/src/DataGrids/Setting/UserDataGrid.php

@@ -40,6 +40,7 @@ public function __construct(UserRepository $userRepository)
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('users')
+            ->distinct()
             ->addSelect(
                 'users.id',
                 'users.name',

packages/Webkul/Admin/src/Http/Controllers/Setting/UserController.php

@@ -26,6 +26,13 @@ class UserController extends Controller
      */
     protected $roleRepository;
 
+    /**
+     * RoleRepository object
+     *
+     * @var \Webkul\User\Repositories\GroupRepository
+     */
+    protected $groupRepository;
+
     /**
      * Create a new controller instance.
      *