DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' into ignore_encrypt_and_other_changes

Browse source
This commit is contained in:
Godfrey Martinez 2023-08-28 10:14:41 -07:00 committed by GitHub
parent 28cf533d19 535ca0e3c0
commit 92e88a0ae2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Transformers/ActionlogsTransformer.php
View file

@ -52,6 +52,8 @@ class ActionlogsTransformer
if (($actionlog->log_meta) && ($actionlog->log_meta!='')) {
$meta_array = json_decode($actionlog->log_meta);
$clean_meta = [];
if ($meta_array) {
foreach ($meta_array as $fieldname => $fieldata) {
if( str_starts_with($fieldname, '_snipeit_')){
@ -65,6 +67,7 @@ class ActionlogsTransformer
$clean_meta[$fieldname]['new'] = $this->clean_field($fieldata->new);
}
}
$clean_meta = $this->changedInfo($clean_meta);
}
}
@ -129,8 +132,10 @@ class ActionlogsTransformer
'log_meta' => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null,
'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
];
// \Log::info("Clean Meta is: ".print_r($clean_meta,true));
//dd($array);
return $array;
}

2
resources/lang/en/admin/settings/general.php
View file

@ -349,7 +349,7 @@ return [
'label2_fields_help' => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
'help_asterisk_bold' => 'Text entered as <code>**text**</code> will be displayed as bold',
'help_blank_to_use' => 'Leave blank to use the value from <code>:setting_name</code>',
'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>',
'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
'default' => 'Default',
'none' => 'None',
'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',

8
resources/views/modals/upload-file.blade.php
View file

@ -15,15 +15,15 @@
<div class="modal-body">
<div class="row">
<div class="col-md-3">
<div class="col-md-12">
<label class="btn btn-default">
{{ trans('button.select_file') }}
<label class="btn btn-default btn-block">
{{ trans('button.select_files') }}
<input type="file" name="file[]" multiple="true" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/*,.csv,.zip,.rar,.doc,.docx,.xls,.xlsx,.xml,.lic,.xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,text/plain,.pdf,application/rtf,application/json" style="display:none" required>
</label>
</div>
<div class="col-md-9">
<div class="col-md-12">
<span id="uploadFile-info"></span>
</div>
<div class="col-md-12">

6
resources/views/settings/labels.blade.php
View file

@ -106,7 +106,7 @@
<div class="col-md-3 text-right">
{{ Form::label('label2_title', trans('admin/settings/general.label2_title'), ['class'=>'control-label']) }}
</div>
<div class="col-md-9">
<div class="col-md-7">
{{ Form::text('label2_title', old('label2_title', $setting->label2_title), [ 'class'=>'form-control', 'placeholder'=>$setting->qr_text, 'aria-label'=>'label2_title' ]) }}
{!! $errors->first('label2_title', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
<p class="help-block">{!! trans('admin/settings/general.label2_title_help') !!}</p>
@ -142,7 +142,7 @@
<div class="col-md-3 text-right">
{{ Form::label('label2_1d_type', trans('admin/settings/general.label2_1d_type'), ['class'=>'control-label']) }}
</div>
<div class="col-md-9">
<div class="col-md-7">
@php
$select1DValues = [
'default' => trans('admin/settings/general.default').' [ '.$setting->alt_barcode.' ]',
@ -174,7 +174,7 @@
<div class="col-md-3 text-right">
{{ Form::label('label2_2d_type', trans('admin/settings/general.label2_2d_type'), ['class'=>'control-label']) }}
</div>
<div class="col-md-9">
<div class="col-md-7">
@php
$select2DValues = [
'default' => trans('admin/settings/general.default').' [ '.$setting->barcode_type.' ]',