From 2f89318d934bc9a7d980b6f73ffdcb20a3888fa1 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Thu, 19 Mar 2026 18:17:40 +0530
Subject: [PATCH] FIX_LIVE_ISSUES

---
 app/Views/UserList.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 59bba538..3e927271 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -388,16 +388,18 @@ table.dataTable tbody td {
                                         <div class="btn-group dropdown" style="position: relative !important;left:0px !important;top:0px !important;">
                                             <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                             <div class="dropdown-menu dropdown-menu-right" style="cursor: pointer;">
-                                                <a class="dropdown-item btnEdit" data-id="<?php echo $row->id; ?>"><i data-id="<?php echo $row->id; ?>" class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle btnEdit"></i>Edit</a>
-                                                <?php if($row->is_active == 1 && in_array(get_session_userid(), [1, 5])) { ?>
-                                                    <a class="dropdown-item btnDelete" data-id="<?php echo $row->id; ?>"><i data-id="<?php echo $row->id; ?>" class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle btnDelete"></i>Delete</a>
-                                                 <?php } ?>
-                                                <?php if($row->is_active == 0 && in_array(get_session_userid(), [1, 5])) { ?>
-                                                    <a class="dropdown-item btnActivate" data-id="<?php echo $row->id; ?>">
-                                                        <i class="mdi mdi-account-check mr-2 text-muted font-18 vertical-middle btnActivate" data-id="<?php echo $row->id; ?>"></i>
-                                                        Activate
-                                                    </a>                                                
-                                                <?php } ?>
+                                                <a class="dropdown-item btnEdit" data-id="<?php echo $row->id; ?>"><i data-id="<?php echo $row->id; ?>" class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle btnEdit"></i>Edit</a> 
+                                                <?php if (in_array(get_role_id(), [1, 5])): ?>
+                                                    <?php if ($row->is_active == 1): ?>
+                                                        <a class="dropdown-item btnDelete" data-id="<?php echo $row->id; ?>">
+                                                            <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
+                                                        </a>
+                                                    <?php else: ?>
+                                                        <a class="dropdown-item btnActivate" data-id="<?php echo $row->id; ?>">
+                                                            <i class="mdi mdi-account-check mr-2 text-muted font-18 vertical-middle"></i>Activate
+                                                        </a>
+                                                    <?php endif; ?>
+                                                <?php endif; ?>
                                             </div>
                                         </div>
                                         </td>