Merged
Conversation
…arlier commits is probably not working correctly
…advanced_search_predefined_filters
…for custom field queries
…om:imbus/snipe-it into feature/advanced_search_predefined_filters
…ed_filters' into systemtests
cz-lucas
requested review from
JonasGoseberg,
Klausw-1 and
Copilot
and removed request for
Copilot
cz-lucas
commented
Sep 24, 2025
|
|
||
| on: | ||
| push: | ||
| branches: ['develope, master'] |
cz-lucas
commented
Sep 24, 2025
|
|
||
| $table->unsignedBigInteger('permission_group_id'); | ||
| $table->unsignedInteger('created_by'); | ||
| $table->timestamps(); |
Member
Author
There was a problem hiding this comment.
I don't know if the should keep the timestamps in the predefined_filter_permissions table. If we remove it public $timestamps = false; needs to be added in the model.
cz-lucas
commented
Sep 24, 2025
| ), | ||
|
|
||
| 'create' => array( | ||
| 'not_allowed' => "Du hast nicht die Berechtigungen um diesen Filter zu erstellen", |
Member
Author
There was a problem hiding this comment.
I think this version for Germany is with Sie
cz-lucas
commented
Sep 24, 2025
|
|
||
| /** | ||
| * Categories API routes | ||
| * Categpries API routes |
JonasGoseberg
approved these changes
Sep 24, 2025
| $user = auth()->user(); | ||
| $validated = $request->validate((new PredefinedFilter)->getRules()); | ||
|
|
||
| if (!empty($validated['is_public']) && !$user->hasAccess('predefinedFilter.create')) { |
There was a problem hiding this comment.
$user-> hasAccess() vs $filter-> userHasPermission()
| return (new SelectlistTransformer)->transformSelectlist($filters); | ||
| } | ||
|
|
||
| // Optional: You can refactor the permission syncing methods similarly |
| $permission = $this->service->store($validated); | ||
|
|
||
| return response()->json([ | ||
| 'message' => __('admin/reports/message.create.success'), |
There was a problem hiding this comment.
this has to be "'message' => trans('admin[...]')
| $this->service->delete($id); | ||
|
|
||
| return response()->json([ | ||
| 'message' => __('admin/reports/message.delete.success'), |
| ->get(); | ||
|
|
||
| return view('hardware/index')->with('company', $company); | ||
| return view('hardware/index')->with('company', $company)->with('predefined_filters', $predefined_filters); // TODO maybe switch later to user / role based view |
|
|
||
| public function test_index_unauthenticated_gets_302() | ||
| { | ||
| $this->getJson('api/v1/predefinedFilters')->assertStatus(302); |
There was a problem hiding this comment.
routes are now predefined-filters
| ->assertOk(); | ||
| } | ||
| } | ||
| } No newline at end of file |
| $currently_set_permssions = $this->predefinedFilterPermissionService->getPermissionsById($filter->id); | ||
| $new_permissions = $validated['permissions']; | ||
| $permission_diff = $this->syncPermissions($currently_set_permssions->toArray(), $new_permissions); | ||
| //dump($permission_diff); |
| DB::transaction(function () use ($permission_diff, $filter) { | ||
| if (!empty($permission_diff['to_delete'])) { | ||
| foreach ($permission_diff['to_delete'] as $permission) { | ||
| //dump($permission); |
| if (!empty($permission_diff['to_add'])) { | ||
| foreach ($permission_diff['to_add'] as $permission) { | ||
| $permission['predefined_filter_id'] = $filter->id; | ||
| //dump($permission); |
Klausw-1
reviewed
Sep 24, 2025
| $this->authorize('index', Asset::class); | ||
| $company = Company::find($request->input('company_id')); | ||
| // $predefined_filters = PredefinedFilter::Auth(); | ||
| // $predefined_filters = PredefinedFilter::orderBy('name')->get(); |
Collaborator
There was a problem hiding this comment.
here is some commented-out code
Klausw-1
reviewed
Sep 24, 2025
| /** | ||
| * PredefinedFilter API routes | ||
| */ | ||
| //Route::middleware('auth:api')->group(function () { |
Collaborator
There was a problem hiding this comment.
Here is the route still commented out.
Klausw-1
approved these changes
Sep 24, 2025
Collaborator
Klausw-1
left a comment
Klausw-1
left a comment
There was a problem hiding this comment.
Review was conducted and changes commented on.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.