Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #15366 use the non-admin edit encrypted custom fields permissions #15373

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Fixed #15366 use the non-admin edit encrypted custom fields permissions #15373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Http/Controllers/Api/AssetsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ public function store(StoreAssetRequest $request): JsonResponse
if ($field->field_encrypted == '1') {
Log::debug('This model field is encrypted in this fieldset.');

if (Gate::allows('admin')) {
if (Gate::allows('assets.view.encrypted_custom_fields')) {

// If input value is null, use custom field's default value
if (($field_val == null) && ($request->has('model_id') != '')) {
Expand Down Expand Up @@ -695,7 +695,7 @@ public function update(UpdateAssetRequest $request, Asset $asset): JsonResponse
}
}
if ($field->field_encrypted == '1') {
if (Gate::allows('admin')) {
if (Gate::allows('assets.view.encrypted_custom_fields')) {
$field_val = Crypt::encrypt($field_val);
} else {
$problems_updating_encrypted_custom_fields = true;
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/Assets/AssetsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function store(ImageUploadRequest $request) : RedirectResponse
if (($model) && ($model->fieldset)) {
foreach ($model->fieldset->fields as $field) {
if ($field->field_encrypted == '1') {
if (Gate::allows('admin')) {
if (Gate::allows('assets.view.encrypted_custom_fields')) {
if (is_array($request->input($field->db_column))) {
$asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
} else {
Expand Down Expand Up @@ -388,7 +388,7 @@ public function update(ImageUploadRequest $request, $assetId = null) : RedirectR
foreach ($model->fieldset->fields as $field) {

if ($field->field_encrypted == '1') {
if (Gate::allows('admin')) {
if (Gate::allows('assets.view.encrypted_custom_fields')) {
if (is_array($request->input($field->db_column))) {
$asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
} else {
Expand Down
Loading