ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed gate name, removed debugging

Browse Source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
2025-07-18 12:45:32 +01:00
parent 4f6e407247
commit ca4d3f6bce
4 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/UsersController.php
+7 -2
View File
@@ -476,7 +476,8 @@ class UsersController extends Controller
return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));
}
if (Gate::allows('canEditSensitiveFieldsForCurrentUser', $user)) {
// check for permissions related fields and pull them out if the current user cannot edit them
if (auth()->user()->can('editSensitiveUserFields') && auth()->user()->can('editableOnDemo')) {
if ($request->filled('password')) {
$user->password = bcrypt($request->input('password'));
@@ -487,7 +488,11 @@ class UsersController extends Controller
}
if ($request->filled('email')) {
$user->username = $request->input('username');
$user->email = $request->input('email');
}
if ($request->filled('activated')) {
$user->activated = $request->input('activated');
}
}
app/Http/Controllers/Users/UsersController.php
+2 -11
View File
@@ -13,17 +13,10 @@ use App\Models\Company;
use App\Models\Group;
use App\Models\Setting;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Password;
use Illuminate\Support\Facades\Storage;
use Redirect;
use Str;
use Symfony\Component\HttpFoundation\StreamedResponse;
use App\Notifications\CurrentInventory;
use Illuminate\Support\Facades\Gate;
/**
* This controller handles all actions related to Users for
@@ -130,7 +123,7 @@ class UsersController extends Controller
}
$user->permissions = json_encode($permissions_array);
// we have to invoke the
// we have to invoke the form request here to handle image uploads
app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
session()->put(['redirect_option' => $request->get('redirect_option')]);
@@ -275,9 +268,8 @@ class UsersController extends Controller
// check for permissions related fields and pull them out if the current user cannot edit them
if (Gate::allows('canEditSensitiveFieldsForCurrentUser', $user)) {
if (auth()->user()->can('editSensitiveUserFields') && auth()->user()->can('editableOnDemo')) {
\Log::debug('Current user can edit these fields');
$user->username = trim($request->input('username'));
$user->email = trim($request->input('email'));
$user->activated = $request->input('activated', 0);
@@ -291,7 +283,6 @@ class UsersController extends Controller
// if a user is editing themselves we should always keep activated true
if (auth()->user()->id == $user->id) {
\Log::debug('User is editing themselves');
$user->activated = 1;
}