Skip to content

Commit 80c39c5

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents 9a3e84d + 2b4d522 commit 80c39c5

File tree

2 files changed

+45
-1
lines changed

2 files changed

+45
-1
lines changed

‎app/Models/Asset.php‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1893,6 +1893,30 @@ function ($query) use ($search_val) {
18931893
);
18941894
}
18951895

1896+
if ($fieldname == 'jobtitle') {
1897+
$query->where(function ($query) use ($search_val) {
1898+
if (is_array($search_val)) {
1899+
$query->whereHasMorph(
1900+
'assignedTo',
1901+
[User::class],
1902+
function ($query) use ($search_val) {
1903+
$query->whereIn('users.jobtitle', $search_val);
1904+
}
1905+
);
1906+
} else {
1907+
$query->whereHasMorph(
1908+
'assignedTo',
1909+
[User::class],
1910+
function ($query) use ($search_val) {
1911+
$query->where(function ($query) use ($search_val) {
1912+
$query->where('users.jobtitle', 'LIKE', '%' . $search_val . '%');
1913+
});
1914+
}
1915+
);
1916+
}
1917+
});
1918+
}
1919+
18961920

18971921
/**
18981922
* THIS CLUNKY BIT IS VERY IMPORTANT
@@ -1917,7 +1941,7 @@ function ($query) use ($search_val) {
19171941
*/
19181942

19191943
if (($fieldname!='category') && ($fieldname!='model_number') && ($fieldname!='rtd_location') && ($fieldname!='location') && ($fieldname!='supplier')
1920-
&& ($fieldname!='status_label') && ($fieldname!='assigned_to') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')
1944+
&& ($fieldname!='status_label') && ($fieldname!='assigned_to') && ($fieldname!='model') && ($fieldname!='jobtitle') && ($fieldname!='company') && ($fieldname!='manufacturer')
19211945
) {
19221946
$query->where('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
19231947
}

‎resources/views/partials/bootstrap-table.blade.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,7 @@ function numberWithCommas(value) {
12561256
},
12571257
attributes: {
12581258
title: '{{ trans('general.create') }}',
1259+
class: 'btn btn-primary',
12591260
@if ($snipeSettings->shortcuts_enabled == 1)
12601261
accesskey: 'n'
12611262
@endif
@@ -1311,6 +1312,7 @@ function numberWithCommas(value) {
13111312
window.location.href = '{{ route('companies.create') }}';
13121313
},
13131314
attributes: {
1315+
class: 'btn btn-primary',
13141316
title: '{{ trans('general.create') }}',
13151317
@if ($snipeSettings->shortcuts_enabled == 1)
13161318
accesskey: 'n'
@@ -1333,6 +1335,7 @@ function numberWithCommas(value) {
13331335
},
13341336
attributes: {
13351337
title: '{{ trans('general.create') }}',
1338+
class: 'btn btn-primary',
13361339
@if ($snipeSettings->shortcuts_enabled == 1)
13371340
accesskey: 'n'
13381341
@endif
@@ -1388,6 +1391,7 @@ function numberWithCommas(value) {
13881391
window.location.href = '{{ route('locations.create') }}';
13891392
},
13901393
attributes: {
1394+
class: 'btn btn-primary',
13911395
title: '{{ trans('general.create') }}',
13921396
@if ($snipeSettings->shortcuts_enabled == 1)
13931397
accesskey: 'n'
@@ -1407,6 +1411,7 @@ function numberWithCommas(value) {
14071411
window.location.href = '{{ route('accessories.create') }}';
14081412
},
14091413
attributes: {
1414+
class: 'btn btn-primary',
14101415
title: '{{ trans('general.create') }}',
14111416
@if ($snipeSettings->shortcuts_enabled == 1)
14121417
accesskey: 'n'
@@ -1426,6 +1431,7 @@ function numberWithCommas(value) {
14261431
window.location.href = '{{ route('depreciations.create') }}';
14271432
},
14281433
attributes: {
1434+
class: 'btn btn-primary',
14291435
title: '{{ trans('general.create') }}',
14301436
@if ($snipeSettings->shortcuts_enabled == 1)
14311437
accesskey: 'n'
@@ -1445,6 +1451,7 @@ function numberWithCommas(value) {
14451451
window.location.href = '{{ route('fields.create') }}';
14461452
},
14471453
attributes: {
1454+
class: 'btn btn-primary',
14481455
title: '{{ trans('general.create') }}',
14491456
@if ($snipeSettings->shortcuts_enabled == 1)
14501457
accesskey: 'n'
@@ -1465,6 +1472,7 @@ function numberWithCommas(value) {
14651472
window.location.href = '{{ route('fieldsets.create') }}';
14661473
},
14671474
attributes: {
1475+
class: 'btn btn-primary',
14681476
title: '{{ trans('general.create') }}',
14691477
@if ($snipeSettings->shortcuts_enabled == 1)
14701478
accesskey: 'n'
@@ -1484,6 +1492,7 @@ function numberWithCommas(value) {
14841492
window.location.href = '{{ route('components.create') }}';
14851493
},
14861494
attributes: {
1495+
class: 'btn btn-primary',
14871496
title: '{{ trans('general.create') }}',
14881497
@if ($snipeSettings->shortcuts_enabled == 1)
14891498
accesskey: 'n'
@@ -1503,6 +1512,7 @@ function numberWithCommas(value) {
15031512
window.location.href = '{{ route('consumables.create') }}';
15041513
},
15051514
attributes: {
1515+
class: 'btn btn-primary',
15061516
title: '{{ trans('general.create') }}',
15071517
@if ($snipeSettings->shortcuts_enabled == 1)
15081518
accesskey: 'n'
@@ -1522,6 +1532,7 @@ function numberWithCommas(value) {
15221532
window.location.href = '{{ route('manufacturers.create') }}';
15231533
},
15241534
attributes: {
1535+
class: 'btn btn-primary',
15251536
title: '{{ trans('general.create') }}',
15261537
@if ($snipeSettings->shortcuts_enabled == 1)
15271538
accesskey: 'n'
@@ -1553,6 +1564,7 @@ function numberWithCommas(value) {
15531564
window.location.href = '{{ route('suppliers.create') }}';
15541565
},
15551566
attributes: {
1567+
class: 'btn btn-primary',
15561568
title: '{{ trans('general.create') }}',
15571569
@if ($snipeSettings->shortcuts_enabled == 1)
15581570
accesskey: 'n'
@@ -1572,6 +1584,7 @@ function numberWithCommas(value) {
15721584
window.location.href = '{{ route('licenses.create') }}';
15731585
},
15741586
attributes: {
1587+
class: 'btn btn-primary',
15751588
title: '{{ trans('general.create') }}',
15761589
@if ($snipeSettings->shortcuts_enabled == 1)
15771590
accesskey: 'n'
@@ -1591,6 +1604,7 @@ function numberWithCommas(value) {
15911604
window.location.href = '{{ route('departments.create') }}';
15921605
},
15931606
attributes: {
1607+
class: 'btn btn-primary',
15941608
title: '{{ trans('general.create') }}',
15951609
@if ($snipeSettings->shortcuts_enabled == 1)
15961610
accesskey: 'n'
@@ -1610,6 +1624,7 @@ function numberWithCommas(value) {
16101624
window.location.href = '{{ route('departments.create') }}';
16111625
},
16121626
attributes: {
1627+
class: 'btn btn-primary',
16131628
title: '{{ trans('general.create') }}',
16141629
@if ($snipeSettings->shortcuts_enabled == 1)
16151630
accesskey: 'n'
@@ -1629,6 +1644,7 @@ function numberWithCommas(value) {
16291644
window.location.href = '{{ route('maintenances.create', ['asset_id' => (isset($asset)) ? $asset->id :'' ]) }}';
16301645
},
16311646
attributes: {
1647+
class: 'btn btn-primary',
16321648
title: '{{ trans('general.create') }}',
16331649
@if ($snipeSettings->shortcuts_enabled == 1)
16341650
accesskey: 'n'
@@ -1648,6 +1664,7 @@ function numberWithCommas(value) {
16481664
window.location.href = '{{ route('categories.create') }}';
16491665
},
16501666
attributes: {
1667+
class: 'btn btn-primary',
16511668
title: '{{ trans('general.create') }}',
16521669
@if ($snipeSettings->shortcuts_enabled == 1)
16531670
accesskey: 'n'
@@ -1667,6 +1684,7 @@ function numberWithCommas(value) {
16671684
window.location.href = '{{ route('models.create') }}';
16681685
},
16691686
attributes: {
1687+
class: 'btn btn-primary',
16701688
title: '{{ trans('general.create') }}',
16711689
@if ($snipeSettings->shortcuts_enabled == 1)
16721690
accesskey: 'n'
@@ -1697,6 +1715,7 @@ function numberWithCommas(value) {
16971715
window.location.href = '{{ route('statuslabels.create') }}';
16981716
},
16991717
attributes: {
1718+
class: 'btn btn-primary',
17001719
title: '{{ trans('general.create') }}',
17011720
@if ($snipeSettings->shortcuts_enabled == 1)
17021721
accesskey: 'n'
@@ -1717,6 +1736,7 @@ function numberWithCommas(value) {
17171736
window.location.href = '{{ route('licenses.create') }}';
17181737
},
17191738
attributes: {
1739+
class: 'btn btn-primary',
17201740
title: '{{ trans('general.create') }}',
17211741
@if ($snipeSettings->shortcuts_enabled == 1)
17221742
accesskey: 'n'

0 commit comments

Comments
 (0)