DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Reverted buttons (this re-introduces the n+1 problem.)

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-10-25 19:43:09 +01:00
parent 887d013a39
commit ab3edae0b6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Transformers/AssetsTransformer.php
View file

@ -237,7 +237,7 @@ class AssetsTransformer
foreach ($asset->model->fieldset->fields as $field) { foreach ($asset->model->fieldset->fields as $field) {
// Only display this if it's allowed via the custom field setting // Only display this if it's allowed via the custom field setting
if ($field->show_in_requestable_list == '1') { if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) {
$value = $asset->{$field->db_column}; $value = $asset->{$field->db_column};
if (($field->format == 'DATE') && (!is_null($value)) && ($value != '')) { if (($field->format == 'DATE') && (!is_null($value)) && ($value != '')) {
@ -255,8 +255,8 @@ class AssetsTransformer
$permissions_array['available_actions'] = [ $permissions_array['available_actions'] = [
'cancel' => ($asset->requests->find(Auth::user()->id)) ? true : false, 'cancel' => ($asset->isRequestedBy(\Auth::user())) ? true : false,
'request' => ($asset->requests->find(Auth::user()->id)) ? false : true, 'request' => ($asset->isRequestedBy(\Auth::user())) ? false : true,
]; ];
$array += $permissions_array; $array += $permissions_array;