DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2023-05-03 10:43:45 -07:00
parent 27600e1553 914b2658cc
commit 79a27085c9
12 changed files with 88 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/AssetMaintenancesController.php
View file

@ -36,7 +36,7 @@ class AssetMaintenancesController extends Controller
{
$this->authorize('view', Asset::class);
$maintenances = AssetMaintenance::select('asset_maintenances.*')->with('asset', 'asset.model', 'asset.location', 'supplier', 'asset.company', 'admin');
$maintenances = AssetMaintenance::select('asset_maintenances.*')->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'admin');
if ($request->filled('search')) {
$maintenances = $maintenances->TextSearch($request->input('search'));

6
app/Http/Controllers/ReportsController.php
View file

@ -898,12 +898,8 @@ class ReportsController extends Controller
public function getAssetMaintenancesReport()
{
$this->authorize('reports.view');
// Grab all the improvements
$assetMaintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company')
->orderBy('created_at', 'DESC')
->get();
return view('reports/asset_maintenances', compact('assetMaintenances'));
return view('reports.asset_maintenances');
}
/**

2
composer.json
View file

@ -17,7 +17,7 @@
}
],
"require": {
"php": ">=7.4 <8.3",
"php": ">=7.4.3 <8.2",
"ext-curl": "*",
"ext-fileinfo": "*",
"ext-json": "*",

13
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "590171872e4a6a29c78efde99fbbf00e",
"content-hash": "c0444af6de1d16a70c7e5520db745170",
"packages": [
{
"name": "alek13/slack",
@ -2673,6 +2673,7 @@
"type": "github"
}
],
"abandoned": true,
"time": "2022-02-23T14:25:13+00:00"
},
{
@ -3803,6 +3804,7 @@
"issues": "https://github.com/LaravelCollective/html/issues",
"source": "https://github.com/LaravelCollective/html"
},
"abandoned": "spatie/laravel-html",
"time": "2022-02-08T21:02:54+00:00"
},
{
@ -5007,6 +5009,10 @@
"source": "https://github.com/maennchen/ZipStream-PHP/tree/2.2.1"
},
"funding": [
{
"url": "https://github.com/maennchen",
"type": "github"
},
{
"url": "https://opencollective.com/zipstream",
"type": "open_collective"
@ -13984,6 +13990,7 @@
"type": "github"
}
],
"abandoned": true,
"time": "2020-12-07T05:51:20+00:00"
},
{
@ -16410,7 +16417,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": ">=7.4 <8.3",
"php": ">=7.4.3 <8.2",
"ext-curl": "*",
"ext-fileinfo": "*",
"ext-json": "*",
@ -16418,5 +16425,5 @@
"ext-pdo": "*"
},
"platform-dev": [],
"plugin-api-version": "2.0.0"
"plugin-api-version": "2.3.0"
}

9
resources/assets/less/overrides.less
View file

@ -195,6 +195,9 @@ a.accordion-header {
.btn-info.btn-outline {
color: #5bc0de;
}
.btn-warning{
background-color:#f39c12 !important;
}
.btn-warning.btn-outline {
color: #f0ad4e;
@ -499,14 +502,14 @@ h4 {
background: #FFFFFF;
border-top: 1px solid #dddddd;
display: table-row;
}
.row-new-striped > .row:nth-of-type(odd) {
background-color: #F8F8F8;
border-top: 1px solid #dddddd;
display: table-row;
}
.row-new-striped div {
@ -740,7 +743,7 @@ input[type="checkbox"] {
input[type="checkbox"]::before {
/** If you want to use the non-checkbox, filled square, use this instead **/
/** If you want to use the non-checkbox, filled square, use this instead **/
content: "";
width: 1em;
height: 1em;

20
resources/assets/less/skins/skin-black-dark.less
View file

@ -135,6 +135,9 @@ a {
#ldapad_test_results.well.well-sm{
color: var(--back-main);
}
a.actions {
color:#fff !important;
}
//pagination
.pagination > li >a{
color: var(--light-link);
@ -147,6 +150,23 @@ a {
.pagination > .active > a:hover{
background-color: var(--hover-link);
}
.tasks-menu > .dropdown-menu > li .menu > li > a:hover .progress{
background-color: var(--background);
}
a:hover > h2.task_menu{
color:var(--header);
}
h2.task_menu{
color:var(--link);
}
.navbar-custom-menu > .navbar-nav > li > .dropdown-menu{
background-color:var(--back-main);
color:var(--link);
}
.navbar-custom-menu > .navbar-nav > li > .dropdown-menu > li.header{
background-color:var(--header);
color:var(--link);
}
.main-header .navbar, .main-header .logo {
background-color: var(--header);

9
resources/assets/less/skins/skin-blue-dark.less
View file

@ -132,6 +132,9 @@ a {
#ldapad_test_results.well.well-sm{
color: var(--back-main);
}
a.actions {
color:#fff !important;
}
//pagination
.pagination > li >a{
color: var(--light-link);
@ -394,6 +397,12 @@ a {
color: var(--visited-link)
}
}
#customFieldsTable a[href*='/models'] {
color: var(--back-sub);
}
#customFieldsTable a[href*='/fieldsets']{
background-color: transparent;
}
.row-striped {
vertical-align: top;

13
resources/assets/less/skins/skin-green-dark.less
View file

@ -131,6 +131,9 @@ a {
#ldapad_test_results.well.well-sm{
color: var(--back-main);
}
a.actions {
color:#fff !important;
}
//pagination
.pagination > li >a{
color: var(--light-link);
@ -180,10 +183,6 @@ h2.task_menu{
color: var(--text-main);
}
a:link {
color: var(--link);
}
.btn-primary.hover {
color: var(--nav-link);
}
@ -385,6 +384,12 @@ a {
color: var(--visited-link)
}
}
#customFieldsTable a[href*='/models'] {
color: var(--back-sub);
}
#customFieldsTable a[href*='/fieldsets']{
background-color: transparent;
}
.row-striped {
vertical-align: top;

9
resources/assets/less/skins/skin-orange-dark.less
View file

@ -119,6 +119,9 @@ li.dropdown-item-marker {
#ldapad_test_results.well.well-sm{
color: var(--back-main);
}
a.actions {
color:#fff !important;
}
//pagination
.pagination > li >a{
color: var(--light-link);
@ -378,6 +381,12 @@ input[type=text], input[type=search] {
.box-header.with-border {
border-bottom: #000;
}
#customFieldsTable a[href*='/models'] {
color: var(--back-sub);
}
#customFieldsTable a[href*='/fieldsets']{
background-color: transparent;
}
.row-striped {
vertical-align: top;

26
resources/assets/less/skins/skin-red-dark.less
View file

@ -58,8 +58,6 @@
}
}
.btn, .btn:hover {
color: #fff;
@ -134,6 +132,7 @@ a {
#ldapad_test_results.well.well-sm{
color: var(--back-main);
}
//pagination
.pagination > li >a{
color: var(--light-link);
@ -186,14 +185,12 @@ h2.task_menu{
a:link {
color: var(--link);
}
a:visited {
color: var(--nav-link);
}
a:hover {
color: var(--hover-link);
}
a:visited {
color: var(--nav-link);
}
.far fa-life-ring{
color:var(--link);
}
@ -380,7 +377,6 @@ input[type=text], input[type=search] {
}
.table-striped>tbody>tr:nth-of-type(even){
background-color: var(--back-sub-alt);
color: var(--text-alt);
}
#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
color: var(--text-main);
@ -394,16 +390,22 @@ a {
color: var(--link);
&:link {
color: var(--link) }
color: var(--nav-link);
}
&:hover {
color: var(--hover-link);
color: var(--nav-link);
text-decoration: underline;
}
&:visited {
color: var(--visited-link)
color: var(--nav-link);
}
}
#customFieldsTable a[href*='/models'] {
color: var(--back-sub);
}
#customFieldsTable a[href*='/fieldsets']{
background-color: transparent;
}
.row-striped {
vertical-align: top;
line-height: 2.6;

12
resources/assets/less/skins/skin-yellow-dark.less
View file

@ -52,7 +52,6 @@
}
.btn, .btn:hover {
color: #000;
&.btn-primary, .btn-primary:link {
background-color: var(--button-default);
@ -60,7 +59,6 @@
color: #545454;
}
&a.btn-primary:hover {
background-color: var(--button-hover);
border-color: var(--button-hover);
@ -77,6 +75,9 @@
color: #545454;
}
}
a.actions {
color:#fff !important;
}
/**
The dropdown is white, so use a darker color
@ -165,7 +166,7 @@ a.btn.btn-default{
color:var(--nav-link);
}
.bootstrap-table .fixed-table-container .table thead th .sortable {
color: var(--nav-link);
color: var(--text-main);
}
.bootstrap-table .fixed-table-toolbar .columns label {
color:#000;
@ -355,12 +356,9 @@ input[type=text], input[type=search] {
.skin-yellow-dark .main-header .navbar .dropdown-menu li a {
color: var(--header);
}
div.th-inner{
tr th div.th-inner {
color:var(--text-main);
}
.fixed-table-body thead th .th-inner, .skin-yellow-dark, .skin-yellow {
background-color: var(--header)!important;
}
.tab-content, .tab-pane {
background-color: var(--back-main);
color: var(--text-main);

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

@ -261,11 +261,11 @@
}
if ((row.available_actions) && (row.available_actions.clone === true)) {
actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/clone" class="actions btn btn-sm btn-info" data-tooltip="true" title="{{ trans('general.clone_item') }}"><i class="far fa-clone" aria-hidden="true"></i><span class="sr-only">Clone</span></a>&nbsp;';
}
if ((row.available_actions) && (row.available_actions.update === true)) {
actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/edit" class="btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.update') }}"><i class="fas fa-pencil-alt" aria-hidden="true"></i><span class="sr-only">{{ trans('general.update') }}</span></a>&nbsp;';
actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '/edit" class="actions btn btn-sm btn-warning" data-tooltip="true" title="{{ trans('general.update') }}"><i class="fas fa-pencil-alt" aria-hidden="true"></i><span class="sr-only">{{ trans('general.update') }}</span></a>&nbsp;';
}
if ((row.available_actions) && (row.available_actions.delete === true)) {
@ -277,7 +277,7 @@
}
actions += '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '" '
+ ' class="btn btn-danger btn-sm delete-asset" data-tooltip="true" '
+ ' class="actions btn btn-danger btn-sm delete-asset" data-tooltip="true" '
+ ' data-toggle="modal" '
+ ' data-content="{{ trans('general.sure_to_delete') }} ' + name_for_box + '?" '
+ ' data-title="{{ trans('general.delete') }}" onClick="return false;">'