fix deleting and adding user from list #49

Merged
paul merged 1 commits from paulcortezl5 into main 5 days ago

@ -88,7 +88,7 @@ $routes->get('adminuser/newuser', 'AdministratorController::newUserView');
$routes->get('adminuser/getuserbyid/(:num)', 'AdministratorController::getUserById/$1');
$routes->post('adminuser/adduser', 'AdministratorController::saveNewUser');
$routes->post('adminuser/updateuser', 'AdministratorController::updateUser');
$routes->post('adminuser/deleteuser', 'AdministratorController::deleteUser');
$routes->get('adminuser/deleteuser/(:num)', 'AdministratorController::deleteUser/$1');
$routes->get('adminuser/editusergroup/(:num)', 'AdministratorController::editUserGroupView/$1');
$routes->get('adminuser/edituserpermission/(:num)', 'AdministratorController::editUserPermissionView/$1');
$routes->post('adminuser/saveusergroup', 'AdministratorController::saveEditedUserGroup');

@ -55,9 +55,10 @@ class AdministratorController extends BaseController
'" data-email="' . $user->email .
'" data-active="' . $user->active .
'" onclick="GetUserByIdForEdit(this)"><i class="fas fa-edit"></i></a>';
$iconDelete = '<form action="adminuser/deleteuser" method="POST" class="d-inline-block" data-toggle="tooltip" title="Delete User"><input type="hidden" name="id" value="' . $user->id . '"/><a type="submit" onclick="return DeleteUserByID()" class="ml-3"><i class="fas fa-trash"></i></a></form>';
$iconUserGroup = '<a href="adminuser/editusergroup/' . $user->id . '" class="ml-3" data-toggle="tooltip" title="Change User Group"><i class="fas fa-users"></i></a>';
$iconUserPermission = '<a href="adminuser/edituserpermission/' . $user->id . '" class="ml-3" data-toggle="tooltip" title="Change User Permission"><i class="fas fa-lock"></i></a>';
//$iconDelete = '<form action="adminuser/deleteuser" method="POST" class="d-inline-block" data-toggle="tooltip" title="Delete User"><input type="hidden" name="id" value="' . $user->id . '"/><a type="submit" onclick="return DeleteUserByID()" class="ml-3"><i class="fas fa-trash"></i></a></form>';
$iconDelete = '<a href="/adminuser/deleteuser/' . $user->id . '" onclick="return confirm(\'Are you sure you want to delete this user?\')" class="ml-3"><i class="fas fa-trash"></i></a>';
$iconUserGroup = '<a href="/adminuser/editusergroup/' . $user->id . '" class="ml-3" data-toggle="tooltip" title="Change User Group"><i class="fas fa-users"></i></a>';
$iconUserPermission = '<a href="/adminuser/edituserpermission/' . $user->id . '" class="ml-3" data-toggle="tooltip" title="Change User Permission"><i class="fas fa-lock"></i></a>';
$iconChangePass = '<a href="#" class="ml-3" ' .
'data-id="' . $user->id .
'" data-displayname="' . $user->display_name .
@ -186,11 +187,10 @@ class AdministratorController extends BaseController
return redirect()->to('/adminuser')->with('message', 'User updated successfully.');
}
public function deleteUser()
public function deleteUser($userid)
{
$user = auth()->getProvider()->findById($this->request->getPost('id'));
$result = $user->delete($user->id, false);
$users = auth()->getProvider();
$result = $users->delete($userid, true);
if($result)
return redirect()->to('/adminuser')->with('message', 'User updated successfully.');
@ -220,7 +220,7 @@ class AdministratorController extends BaseController
'employee_id' => $employee->company_issued_id,
'display_name' => $employee->first_name." ".$employee->last_name,
]);
if($users->save($user))
{
// To get the complete user object with ID, we need to get from the database

@ -37,6 +37,7 @@ class UserModel extends BaseModel
'active',
'last_active',
'company_id',
'sys_emp_id',
'employee_id',
'display_name',
];

Loading…
Cancel
Save