From 4291c3c594948da84c4d8027fb237bb797f7cd9b Mon Sep 17 00:00:00 2001
From: Sevan Nerse <nerse.sevan@gmail.com>
Date: Tue, 28 Jun 2022 21:58:44 +0300
Subject: [PATCH] user listing flow updated

---
 app/Models/Auth/User.php                   | 14 ++++++--------
 resources/views/auth/users/index.blade.php | 14 +++++---------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php
index 2d4d21c8a..e51b4fa1b 100644
--- a/app/Models/Auth/User.php
+++ b/app/Models/Auth/User.php
@@ -311,14 +311,12 @@ class User extends Authenticatable implements HasLocalePreference
             return $actions;
         }
 
-        if (! $this->hasPendingInvitation()) {
-            $actions[] = [
-                'title' => trans('general.edit'),
-                'icon' => 'edit',
-                'url' => route('users.edit', $this->id),
-                'permission' => 'update-auth-users',
-            ];
-        }
+        $actions[] = [
+            'title' => trans('general.edit'),
+            'icon' => 'edit',
+            'url' => route('users.edit', $this->id),
+            'permission' => 'update-auth-users',
+        ];
 
         if ($this->hasPendingInvitation()) {
             $actions[] = [
diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php
index dc7b0e3c3..48c00e447 100644
--- a/resources/views/auth/users/index.blade.php
+++ b/resources/views/auth/users/index.blade.php
@@ -48,15 +48,11 @@
                         @foreach($users as $item)
                             <x-table.tr href="{{ route('users.edit', $item->id) }}">
                                 <x-table.td class="ltr:pr-6 rtl:pl-6 hidden sm:table-cell" override="class">
-                                    @if (user()->id != $item->id)
-                                        <x-index.bulkaction.single
-                                            id="{{ $item->id }}"
-                                            name="{{ $item->name }}"
-                                            :disabled="($item->hasPendingInvitation() || $item->multiplexed) ? true : false"
-                                        />
-                                    @else
-                                        <x-index.bulkaction.single id="{{ $item->id }}" name="{{ $item->name }}" disabled />
-                                    @endif
+                                    <x-index.bulkaction.single
+                                        id="{{ $item->id }}"
+                                        name="{{ $item->name }}"
+                                        :disabled="($item->hasPendingInvitation() || user()->id == $item->id) ? true : false"
+                                    />
                                 </x-table.td>
 
                                 <x-table.td class="w-4/12 sm:w-5/12">