Skip to content

Commit 1225597

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]> # Conflicts: # public/css/build/app.css # public/css/dist/all.css # public/mix-manifest.json
2 parents 366b618 + f357dd6 commit 1225597

File tree

15 files changed

+462
-333
lines changed

15 files changed

+462
-333
lines changed

‎app/View/Label.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,10 @@ public function render(callable $callback = null)
177177
// The end result of this will be in this format:
178178
// {labelOne} {valueOne} | {labelTwo} {valueTwo} | {labelThree} {valueThree}
179179
$previous['value'] = trim(implode(' | ', [
180-
implode(' ', [$previous['label'], $previous['value']]),
180+
implode(' ', [null, $previous['value']]),
181181
implode(' ', [$current['label'], $current['value']]),
182182
]));
183183

184-
// We'll set the label to an empty string since we
185-
// injected the label into the value field above.
186-
$previous['label'] = '';
187-
188184
return $previous;
189185
});
190186

‎public/css/build/app.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/dist/all.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/mix-manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=d34ae2483cbe2c77478c45f4006eba55",
44
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=6bf62cdec2477f3176df196fd0c99662",
55
"/css/build/overrides.css": "/css/build/overrides.css?id=1956dacae986380f376eb30f849d899a",
6-
"/css/build/app.css": "/css/build/app.css?id=14158c05ed4795311c028b18ea9a616f",
6+
"/css/build/app.css": "/css/build/app.css?id=adad39d650ea189b9a44f8d07df73761",
77
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=a67bd93bed52e6a29967fe472de66d6c",
88
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f",
99
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=53edc92eb2d272744bc7404ec259930e",
@@ -19,7 +19,7 @@
1919
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=091d9625203be910caca3e229afe438f",
2020
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=18787b3f00a3be7be38ee4e26cbd2a07",
2121
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b",
22-
"/css/dist/all.css": "/css/dist/all.css?id=7bdd2e09505b405c4c2d02d6ebd07278",
22+
"/css/dist/all.css": "/css/dist/all.css?id=15fe3863037f44de1c50c30748d0bc09",
2323
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
2424
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
2525
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

‎resources/assets/less/app.less‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,17 @@ a.logo.no-hover a:hover {
384384
background-color: transparent;
385385
}
386386

387+
.index-block {
388+
overflow: hidden;
389+
text-overflow: ellipsis;
390+
white-space: nowrap;
391+
}
392+
.index-block:hover{
393+
overflow: visible;
394+
white-space: normal;
395+
height:auto;
396+
}
397+
387398
input:required, select:required, textarea:required {
388399
border-right: 6px solid orange;
389400
}

‎resources/lang/en-US/admin/settings/general.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,9 @@
465465
'logos' => 'Logos & Display',
466466
'colors' => 'Colors & Skins',
467467
'footer' => 'Footer Preferences',
468+
'security' => 'Security Preferences',
469+
'general' => 'General',
470+
'intervals' => 'Intervals & Thresholds',
468471
],
469472

470473

‎resources/views/hardware/edit.blade.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,17 @@ function fetchCustomFields() {
224224
//now re-populate the custom fields based on the previously saved values
225225
$('#custom_fields_content').find('input,select').each(function (index,elem) {
226226
if(transformed_oldvals[elem.name]) {
227+
if (elem.type === 'checkbox' || elem.type === 'radio'){
228+
let shouldBeChecked = oldvals.find(oldValElement => {
229+
return oldValElement.name === elem.name && oldValElement.value === $(elem).val();
230+
});
231+
232+
if (shouldBeChecked){
233+
$(elem).prop('checked', true);
234+
}
235+
236+
return;
237+
}
227238
{{-- If there already *is* is a previously-input 'transformed_oldvals' handy,
228239
overwrite with that previously-input value *IF* this is an edit of an existing item *OR*
229240
if there is no new default custom field value coming from the model --}}

‎resources/views/hardware/requested.blade.php‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<div class="row">
2121
<div class="col-md-12">
2222

23-
@if ($requestedItems->count() > 0)
2423
<div class="table-responsive">
2524
<table
2625
name="requestedAssets"
@@ -133,14 +132,7 @@ class="table table-striped snipe-table"
133132
</table>
134133
</div>
135134

136-
@else
137-
<div class="col-md-12">
138-
<div class="alert alert-info alert-block">
139-
<i class="fas fa-info-circle"></i>
140-
{{ trans('general.no_results') }}
141-
</div>
142-
</div>
143-
@endif
135+
144136
</div>
145137
</div>
146138
</div>

‎resources/views/hardware/view.blade.php‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,6 @@ class="form-inline"
11641164
<div class="row{{($asset->licenses->count() > 0 ) ? '' : ' hidden-print'}}">
11651165
<div class="col-md-12">
11661166
<!-- Licenses assets table -->
1167-
@if ($asset->licenses->count() > 0)
11681167
<table class="table">
11691168
<thead>
11701169
<tr>
@@ -1197,13 +1196,6 @@ class="form-inline"
11971196
@endforeach
11981197
</tbody>
11991198
</table>
1200-
@else
1201-
1202-
<div class="alert alert-info alert-block hidden-print">
1203-
<x-icon type="info-circle" />
1204-
{{ trans('general.no_results') }}
1205-
</div>
1206-
@endif
12071199
</div><!-- /col -->
12081200
</div> <!-- row -->
12091201
</div> <!-- /.tab-pane software -->
@@ -1212,7 +1204,7 @@ class="form-inline"
12121204
<!-- checked out assets table -->
12131205
<div class="row{{($asset->components->count() > 0 ) ? '' : ' hidden-print'}}">
12141206
<div class="col-md-12">
1215-
@if($asset->components->count() > 0)
1207+
12161208
<table class="table table-striped">
12171209
<thead>
12181210
<th>{{ trans('general.name') }}</th>
@@ -1257,12 +1249,6 @@ class="form-inline"
12571249
</tr>
12581250
</tfoot>
12591251
</table>
1260-
@else
1261-
<div class="alert alert-info alert-block hidden-print">
1262-
<x-icon type="info-circle" />
1263-
{{ trans('general.no_results') }}
1264-
</div>
1265-
@endif
12661252
</div>
12671253
</div>
12681254
</div> <!-- /.tab-pane components -->
@@ -1272,9 +1258,6 @@ class="form-inline"
12721258
<div class="row{{($asset->assignedAssets->count() > 0 ) ? '' : ' hidden-print'}}">
12731259
<div class="col-md-12">
12741260

1275-
@if ($asset->assignedAssets->count() > 0)
1276-
1277-
12781261
<form
12791262
method="POST"
12801263
action="{{ route('hardware/bulkedit') }}"
@@ -1323,14 +1306,6 @@ class="table table-striped snipe-table"
13231306
</form>
13241307
</div>
13251308

1326-
@else
1327-
1328-
<div class="alert alert-info alert-block hidden-print">
1329-
<x-icon type="info-circle" />
1330-
{{ trans('general.no_results') }}
1331-
</div>
1332-
@endif
1333-
13341309

13351310
</div><!-- /col -->
13361311
</div> <!-- row -->

‎resources/views/locations/view.blade.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ class="table table-striped snipe-table"
247247

248248
@include('partials.asset-bulk-actions', ['id_divname' => 'AssignedAssetsBulkEditToolbar', 'id_formname' => 'assignedAssetsBulkForm', 'id_button' => 'AssignedbulkAssetEditButton'])
249249
<table
250+
role="table"
250251
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
251252
data-cookie-id-table="assetsAssignedListingTable"
252253
data-pagination="true"
@@ -261,7 +262,7 @@ class="table table-striped snipe-table"
261262
data-bulk-button-id="#AssignedbulkAssetEditButton"
262263
data-bulk-form-id="#assignedAssetsBulkForm"
263264
data-click-to-select="true"
264-
id="assetsListingTable"
265+
id="assetsAssignedListingTable"
265266
class="table table-striped snipe-table"
266267
data-url="{{route('api.assets.index', ['assigned_to' => $location->id, 'assigned_type' => 'App\Models\Location']) }}"
267268
data-export-options='{
@@ -276,6 +277,7 @@ class="table table-striped snipe-table"
276277

277278
@include('partials.asset-bulk-actions', ['id_divname' => 'RTDassetsBulkEditToolbar', 'id_formname' => 'RTDassets', 'id_button' => 'RTDbulkAssetEditButton'])
278279
<table
280+
role="table"
279281
data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
280282
data-cookie-id-table="RTDassetsListingTable"
281283
data-pagination="true"
@@ -305,6 +307,7 @@ class="table table-striped snipe-table"
305307
<div class="tab-pane" id="accessories">
306308
<h2 class="box-title">{{ trans('general.accessories') }}</h2>
307309
<table
310+
role="table"
308311
data-columns="{{ \App\Presenters\AccessoryPresenter::dataTableLayout() }}"
309312
data-cookie-id-table="accessoriesListingTable"
310313
data-pagination="true"
@@ -331,6 +334,7 @@ class="table table-striped snipe-table"
331334
</h2>
332335

333336
<table
337+
role="table"
334338
data-columns="{{ \App\Presenters\LocationPresenter::assignedAccessoriesDataTableLayout() }}"
335339
data-cookie-id-table="accessoriesAssignedListingTable"
336340
data-pagination="true"
@@ -356,6 +360,7 @@ class="table table-striped snipe-table"
356360
<div class="tab-pane" id="consumables">
357361
<h2 class="box-title">{{ trans('general.consumables') }}</h2>
358362
<table
363+
role="table"
359364
data-columns="{{ \App\Presenters\ConsumablePresenter::dataTableLayout() }}"
360365
data-cookie-id-table="consumablesListingTable"
361366
data-pagination="true"
@@ -379,6 +384,7 @@ class="table table-striped snipe-table"
379384
<div class="tab-pane" id="components">
380385
<h2 class="box-title">{{ trans('general.components') }}</h2>
381386
<table
387+
role="table"
382388
data-columns="{{ \App\Presenters\ComponentPresenter::dataTableLayout() }}"
383389
data-cookie-id-table="componentsTable"
384390
data-pagination="true"

0 commit comments

Comments
 (0)