DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 05:47:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make custom fields into their own JSON array

Browse source
This commit is contained in:
snipe 2017-07-08 18:44:28 -07:00
parent de5e7bd9ba
commit 9bcfe0748b
3 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,25 +88,25 @@ class AssetsTransformer
$decrypted = \App\Helpers\Helper::gracefulDecrypt($field,$asset->{$field->convertUnicodeDbSlug()});
$value = (Gate::allows('superadmin')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));
$fields_array = [$field->convertUnicodeDbSlug() => $value];
// $fields_array = [$field->convertUnicodeDbSlug() => $value];
// $fields_array[$field->name] = [
// 'field' => $field->convertUnicodeDbSlug(),
// 'value' => $value
// ];
$fields_array[$field->name] = [
'field' => $field->convertUnicodeDbSlug(),
'value' => $value
];
} else {
// $fields_array[$field->name] = [
// 'field' => $field->convertUnicodeDbSlug(),
// 'value' => $asset->{$field->convertUnicodeDbSlug()}
// ];
$fields_array = [$field->convertUnicodeDbSlug() => $asset->{$field->convertUnicodeDbSlug()}];
$fields_array[$field->name] = [
'field' => $field->convertUnicodeDbSlug(),
'value' => $asset->{$field->convertUnicodeDbSlug()}
];
//$fields_array = [$field->convertUnicodeDbSlug() => $asset->{$field->convertUnicodeDbSlug()}];
}
$array += $fields_array;
//$array['custom_fields'] = $fields_array;
//array += $fields_array;
$array['custom_fields'] = $fields_array;
}
}

6
app/Presenters/AssetPresenter.php
View file

@ -178,11 +178,13 @@ class AssetPresenter extends Presenter
$fields = CustomField::all();
foreach ($fields as $field) {
$layout[] = ["field" => $field->convertUnicodeDbSlug(),
$layout[] = [
"field" => 'custom_fields.'.$field->convertUnicodeDbSlug(),
"searchable" => true,
"sortable" => true,
"switchable" => true,
"title" => ($field->field_encrypted=='1') ?'<i class="fa fa-lock"></i> '.e($field->name) : e($field->name)
"title" => ($field->field_encrypted=='1') ?'<i class="fa fa-lock"></i> '.e($field->name) : e($field->name),
"formatter" => "customFieldsFormatter"
];
}

17
resources/views/partials/bootstrap-table.blade.php
View file

@ -247,8 +247,23 @@ $('.snipe-table').bootstrapTable({
}
// This is gross, but necessary so that we can package the API response
// for custom fields in a more useful way.
function customFieldsFormatter(value, row) {
function createdAtFormatter(value, row) {
var field_column = this.title;
// Pull out any HTMl that might be passed via the presenter
// (for example, the locked icon for encrypted fields)
var field_column_plain = field_column.replace(/<(?:.|\n)*?> ?/gm, '');
if (row.custom_fields[field_column_plain]) {
return row.custom_fields[field_column_plain].value;
}
}
function createdAtFormatter(value) {
if ((value) && (value.date)) {
return value.date;
}