ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2025-06-11 10:20:22 +01:00
parent 65a8126a13 49c289a094
commit f7cfee77c9
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Importer/CategoryImporter.php
View File

@@ -66,7 +66,7 @@ class CategoryImporter extends ItemImporter
$this->item['name'] = trim($this->findCsvMatch($row, 'name'));
$this->item['notes'] = trim($this->findCsvMatch($row, 'notes'));
$this->item['eula_text'] = trim($this->findCsvMatch($row, 'eula_text'));
$this->item['category_type'] = trim($this->findCsvMatch($row, 'category_type'));
$this->item['category_type'] = trim(strtolower($this->findCsvMatch($row, 'category_type')));
$this->item['use_default_eula'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'use_default_eula'))) == 1) ? 1 : 0;
$this->item['require_acceptance'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'require_acceptance'))) == 1) ? 1 : 0;
$this->item['checkin_email'] = trim(($this->fetchHumanBoolean($this->findCsvMatch($row, 'checkin_email'))) == 1) ? 1 : 0;

2
app/Models/Accessory.php
View File

@@ -308,7 +308,7 @@ class Accessory extends SnipeModel
*/
public function checkin_email()
{
return $this->category->checkin_email;
return $this->category?->checkin_email;
}
/**

2
app/Models/Consumable.php
View File

@@ -284,7 +284,7 @@ class Consumable extends SnipeModel
*/
public function checkin_email()
{
return $this->category->checkin_email;
return $this->category?->checkin_email;
}
/**

22
app/Presenters/HistoryPresenter.php
View File

@@ -40,7 +40,7 @@ class HistoryPresenter extends Presenter
'sortable' => true,
'switchable' => true,
'title' => trans('general.created_at'),
'visible' => false,
'visible' => true,
'formatter' => 'dateDisplayFormatter',
],
[
@@ -48,7 +48,7 @@ class HistoryPresenter extends Presenter
'searchable' => false,
'sortable' => true,
'title' => trans('general.created_by'),
'visible' => false,
'visible' => true,
'formatter' => 'usersLinkObjFormatter',
],
[
@@ -65,7 +65,7 @@ class HistoryPresenter extends Presenter
'sortable' => true,
'switchable' => true,
'title' => trans('general.action'),
'visible' => false,
'visible' => true,
],
[
'field' => 'item',
@@ -73,7 +73,7 @@ class HistoryPresenter extends Presenter
'sortable' => true,
'switchable' => true,
'title' => trans('general.item'),
'visible' => false,
'visible' => true,
'formatter' => 'polymorphicItemFormatter',
],
];
@@ -96,7 +96,7 @@ class HistoryPresenter extends Presenter
'sortable' => true,
'switchable' => true,
'title' => trans('general.target'),
'visible' => false,
'visible' => true,
'formatter' => 'polymorphicItemFormatter',
],
[
@@ -105,7 +105,7 @@ class HistoryPresenter extends Presenter
'sortable' => true,
'switchable' => true,
'title' => trans('general.file_name'),
'visible' => false,
'visible' => true,
'formatter' => 'fileUploadNameFormatter',
],
[
@@ -114,14 +114,14 @@ class HistoryPresenter extends Presenter
'sortable' => true,
'switchable' => true,
'title' => trans('general.download'),
'visible' => false,
'visible' => true,
'formatter' => 'fileUploadFormatter',
],
[
'field' => 'note',
'searchable' => true,
'sortable' => true,
'visible' => false,
'visible' => true,
'title' => trans('general.notes'),
'formatter' => 'notesFormatter'
],
@@ -146,21 +146,21 @@ class HistoryPresenter extends Presenter
'field' => 'remote_ip',
'searchable' => false,
'sortable' => false,
'visible' => true,
'visible' => false,
'title' => trans('admin/settings/general.login_ip'),
],
[
'field' => 'user_agent',
'searchable' => false,
'sortable' => false,
'visible' => true,
'visible' => false,
'title' => trans('admin/settings/general.login_user_agent'),
],
[
'field' => 'action_source',
'searchable' => false,
'sortable' => false,
'visible' => true,
'visible' => false,
'title' => trans('general.action_source'),
],
];

2
resources/views/users/view.blade.php
View File

@@ -336,7 +336,7 @@
@if ($user->isSuperUser())
<span class="label label-danger" data-tooltip="true" title="{{ trans('general.superuser_tooltip') }}"><x-icon type="superadmin" title="{{ trans('general.superuser') }}" /></span>&nbsp;
@elseif ($user->hasAccess('admin'))
<span class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}"><x-icon type="superadmin" title="{{ trans('general.admin') }}" /></span>&nbsp;
<span class="label label-warning" data-tooltip="true" title="{{ trans('general.admin_tooltip') }}"><x-icon type="superadmin" title="{{ trans('general.admin_user') }}" /></span>&nbsp;
@endif
{{ $user->username }}