Skip to content

Commit df38d7e

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]> # Conflicts: # config/version.php
2 parents 44dd061 + b8799f8 commit df38d7e

File tree

5 files changed

+60
-59
lines changed

5 files changed

+60
-59
lines changed

‎app/Http/Controllers/Api/StatuslabelsController.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,18 +290,20 @@ public function assets(Request $request, $id) : array
290290

291291
/**
292292
* Returns a boolean response based on whether the status label
293-
* is one that is deployable.
293+
* is one that is deployable or pending.
294294
*
295295
* This is used by the hardware create/edit view to determine whether
296-
* we should provide a dropdown of users for them to check the asset out to.
296+
* we should provide a dropdown of users for them to check the asset out to,
297+
* and whether we show a warning that the asset will be checked in if it's already
298+
* assigned but the status is changed to one that isn't pending or deployable
297299
*
298300
* @author [A. Gianotto] [<[email protected]>]
299301
* @since [v4.0]
300302
*/
301303
public function checkIfDeployable($id) : string
302304
{
303305
$statuslabel = Statuslabel::findOrFail($id);
304-
if ($statuslabel->getStatuslabelType() == 'deployable') {
306+
if (($statuslabel->getStatuslabelType() == 'pending') || ($statuslabel->getStatuslabelType() == 'deployable')) {
305307
return '1';
306308
}
307309

‎app/Http/Controllers/Assets/AssetsController.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,15 +340,14 @@ public function update(ImageUploadRequest $request, Asset $asset) : RedirectResp
340340

341341
$status = Statuslabel::find($request->input('status_id'));
342342

343-
// This is a non-deployable status label - we should check the asset back in.
344-
if (($status && $status->getStatuslabelType() != 'deployable') && ($target = $asset->assignedTo)) {
345-
343+
// This is an archived or undeployable - we should check the asset back in.
344+
// Pending is allowed here
345+
if (($status) && (($status->getStatuslabelType() != 'pending') && ($status->getStatuslabelType() != 'deployable')) && ($target = $asset->assignedTo)) {
346346
$originalValues = $asset->getRawOriginal();
347347
$asset->assigned_to = null;
348348
$asset->assigned_type = null;
349349
$asset->accepted = null;
350-
351-
event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update', date('Y-m-d H:i:s'), $originalValues));
350+
event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update with '.$status->getStatuslabelType().' status', date('Y-m-d H:i:s'), $originalValues));
352351
}
353352

354353
if ($asset->assigned_to == '') {

‎config/version.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22
return array (
3-
'app_version' => 'v8.0.1',
4-
'full_app_version' => 'v8.0.1 - build 16992-g18c7cbbbb',
5-
'build_version' => '16992',
3+
'app_version' => 'v8.0.2',
4+
'full_app_version' => 'v8.0.2 - build 17048-g44dd06161',
5+
'build_version' => '17048',
66
'prerelease_version' => '',
7-
'hash_version' => 'g18c7cbbbb',
8-
'full_hash' => 'v8.0.1-28-g18c7cbbbb',
7+
'hash_version' => 'g44dd06161',
8+
'full_hash' => 'v8.0.2-54-g44dd06161',
99
'branch' => 'master',
1010
);

‎resources/lang/en-US/admin/hardware/form.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
'asset_location_update_actual' => 'Update only actual location',
5757
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
5858
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
59-
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
59+
'asset_deployable' => 'This asset can be checked out.',
6060
'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
6161
'optional_infos' => 'Optional Information',
6262
'order_details' => 'Order Related Information',

‎resources/views/reports/custom.blade.php‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -93,152 +93,152 @@ class="form-control"
9393
</label>
9494

9595
<label class="form-control">
96-
{{ Form::checkbox('id', '1', $template->checkmarkValue('id')) }}
96+
<input type="checkbox" name="id" value="1" @checked($template->checkmarkValue('id')) />
9797
{{ trans('general.id') }}
9898
</label>
9999

100100
<label class="form-control">
101-
{{ Form::checkbox('company', '1', $template->checkmarkValue('company')) }}
101+
<input type="checkbox" name="company" value="1" @checked($template->checkmarkValue('company')) />
102102
{{ trans('general.company') }}
103103
</label>
104104

105105
<label class="form-control">
106-
{{ Form::checkbox('asset_tag', '1', $template->checkmarkValue('asset_tag')) }}
106+
<input type="checkbox" name="asset_tag" value="1" @checked($template->checkmarkValue('asset_tag')) />
107107
{{ trans('general.asset_tag') }}
108108
</label>
109109

110110
<label class="form-control">
111-
{{ Form::checkbox('asset_name', '1', $template->checkmarkValue('asset_name')) }}
111+
<input type="checkbox" name="asset_name" value="1" @checked($template->checkmarkValue('asset_name')) />
112112
{{ trans('admin/hardware/form.name') }}
113113
</label>
114114

115115
<label class="form-control">
116-
{{ Form::checkbox('manufacturer', '1', $template->checkmarkValue('manufacturer')) }}
116+
<input type="checkbox" name="manufacturer" value="1" @checked($template->checkmarkValue('manufacturer')) />
117117
{{ trans('general.manufacturer') }}
118118
</label>
119119

120120
<label class="form-control">
121-
{{ Form::checkbox('model', '1', $template->checkmarkValue('model')) }}
121+
<input type="checkbox" name="model" value="1" @checked($template->checkmarkValue('model')) />
122122
{{ trans('general.asset_models') }}
123123
</label>
124124

125125
<label class="form-control">
126-
{{ Form::checkbox('category', '1', $template->checkmarkValue('category')) }}
126+
<input type="checkbox" name="category" value="1" @checked($template->checkmarkValue('category')) />
127127
{{ trans('general.category') }}
128128
</label>
129129

130130
<label class="form-control">
131-
{{ Form::checkbox('serial', '1', $template->checkmarkValue('serial')) }}
131+
<input type="checkbox" name="serial" value="1" @checked($template->checkmarkValue('serial')) />
132132
{{ trans('admin/hardware/table.serial') }}
133133
</label>
134134

135135
<label class="form-control">
136-
{{ Form::checkbox('purchase_date', '1', $template->checkmarkValue('purchase_date')) }}
136+
<input type="checkbox" name="purchase_date" value="1" @checked($template->checkmarkValue('purchase_date')) />
137137
{{ trans('admin/licenses/table.purchase_date') }}
138138
</label>
139139

140140
<label class="form-control">
141-
{{ Form::checkbox('purchase_cost', '1', $template->checkmarkValue('purchase_cost')) }}
141+
<input type="checkbox" name="purchase_cost" value="1" @checked($template->checkmarkValue('purchase_cost')) />
142142
{{ trans('admin/hardware/form.cost') }}
143143
</label>
144144

145145
<label class="form-control">
146-
{{ Form::checkbox('eol', '1', $template->checkmarkValue('eol')) }}
146+
<input type="checkbox" name="eol" value="1" @checked($template->checkmarkValue('eol')) />
147147
{{ trans('admin/hardware/form.eol_date') }}
148148
</label>
149149

150150
<label class="form-control">
151-
{{ Form::checkbox('order', '1', $template->checkmarkValue('order')) }}
151+
<input type="checkbox" name="order" value="1" @checked($template->checkmarkValue('order')) />
152152
{{ trans('admin/hardware/form.order') }}
153153
</label>
154154

155155
<label class="form-control">
156-
{{ Form::checkbox('supplier', '1', $template->checkmarkValue('supplier')) }}
156+
<input type="checkbox" name="supplier" value="1" @checked($template->checkmarkValue('supplier')) />
157157
{{ trans('general.suppliers') }}
158158
</label>
159159

160160
<label class="form-control">
161-
{{ Form::checkbox('location', '1', $template->checkmarkValue('location')) }}
161+
<input type="checkbox" name="location" value="1" @checked($template->checkmarkValue('location')) />
162162
{{ trans('general.location') }}
163163
</label>
164164

165165
<label class="form-control" style="margin-left: 25px;">
166-
{{ Form::checkbox('location_address', '1', $template->checkmarkValue('location_address')) }}
166+
<input type="checkbox" name="location_address" value="1" @checked($template->checkmarkValue('location_address')) />
167167
{{ trans('general.address') }}
168168
</label>
169169

170170
<label class="form-control">
171-
{{ Form::checkbox('rtd_location', '1', $template->checkmarkValue('rtd_location')) }}
171+
<input type="checkbox" name="rtd_location" value="1" @checked($template->checkmarkValue('rtd_location')) />
172172
{{ trans('admin/hardware/form.default_location') }}
173173
</label>
174174

175175
<label class="form-control" style="margin-left: 25px;">
176-
{{ Form::checkbox('rtd_location_address', '1', $template->checkmarkValue('rtd_location_address')) }}
176+
<input type="checkbox" name="rtd_location_address" value="1" @checked($template->checkmarkValue('rtd_location_address')) />
177177
{{ trans('general.address') }}
178178
</label>
179179

180180
<label class="form-control">
181-
{{ Form::checkbox('status', '1', $template->checkmarkValue('status')) }}
181+
<input type="checkbox" name="status" value="1" @checked($template->checkmarkValue('status')) />
182182
{{ trans('general.status') }}
183183
</label>
184184

185185
<label class="form-control">
186-
{{ Form::checkbox('warranty', '1', $template->checkmarkValue('warranty')) }}
186+
<input type="checkbox" name="warranty" value="1" @checked($template->checkmarkValue('warranty')) />
187187
{{ trans('admin/hardware/form.warranty') }}
188188
</label>
189189

190190
<label class="form-control">
191-
{{ Form::checkbox('depreciation', '1', $template->checkmarkValue('depreciation')) }}
191+
<input type="checkbox" name="depreciation" value="1" @checked($template->checkmarkValue('depreciation')) />
192192
{{ trans('general.depreciation') }}
193193
</label>
194194

195195
<label class="form-control">
196-
{{ Form::checkbox('checkout_date', '1', $template->checkmarkValue('checkout_date')) }}
196+
<input type="checkbox" name="checkout_date" value="1" @checked($template->checkmarkValue('checkout_date')) />
197197
{{ trans('admin/hardware/table.checkout_date') }}
198198
</label>
199199

200200
<label class="form-control">
201-
{{ Form::checkbox('checkin_date', '1', $template->checkmarkValue('checkin_date')) }}
201+
<input type="checkbox" name="checkin_date" value="1" @checked($template->checkmarkValue('checkin_date')) />
202202
{{ trans('admin/hardware/table.last_checkin_date') }}
203203
</label>
204204

205205
<label class="form-control">
206-
{{ Form::checkbox('expected_checkin', '1', $template->checkmarkValue('expected_checkin')) }}
206+
<input type="checkbox" name="expected_checkin" value="1" @checked($template->checkmarkValue('expected_checkin')) />
207207
{{ trans('admin/hardware/form.expected_checkin') }}
208208
</label>
209209

210210
<label class="form-control">
211-
{{ Form::checkbox('created_at', '1', $template->checkmarkValue('created_at')) }}
211+
<input type="checkbox" name="created_at" value="1" @checked($template->checkmarkValue('created_at')) />
212212
{{ trans('general.created_at') }}
213213
</label>
214214

215215
<label class="form-control">
216-
{{ Form::checkbox('updated_at', '1', $template->checkmarkValue('updated_at')) }}
216+
<input type="checkbox" name="updated_at" value="1" @checked($template->checkmarkValue('updated_at')) />
217217
{{ trans('general.updated_at') }}
218218
</label>
219219

220220
<label class="form-control">
221-
{{ Form::checkbox('deleted_at', '1', $template->checkmarkValue('deleted_at')) }}
221+
<input type="checkbox" name="deleted_at" value="1" @checked($template->checkmarkValue('deleted_at')) />
222222
{{ trans('general.deleted') }}
223223
</label>
224224

225225
<label class="form-control">
226-
{{ Form::checkbox('last_audit_date', '1', $template->checkmarkValue('last_audit_date')) }}
226+
<input type="checkbox" name="last_audit_date" value="1" @checked($template->checkmarkValue('last_audit_date')) />
227227
{{ trans('general.last_audit') }}
228228
</label>
229229

230230
<label class="form-control">
231-
{{ Form::checkbox('next_audit_date', '1', $template->checkmarkValue('next_audit_date')) }}
231+
<input type="checkbox" name="next_audit_date" value="1" @checked($template->checkmarkValue('next_audit_date')) />
232232
{{ trans('general.next_audit_date') }}
233233
</label>
234234

235235
<label class="form-control">
236-
{{ Form::checkbox('notes', '1', $template->checkmarkValue('notes')) }}
236+
<input type="checkbox" name="notes" value="1" @checked($template->checkmarkValue('notes')) />
237237
{{ trans('general.notes') }}
238238
</label>
239239

240240
<label class="form-control" style="margin-left: 25px;">
241-
{{ Form::checkbox('url', '1', $template->checkmarkValue('url')) }}
241+
<input type="checkbox" name="url" value="1" @checked($template->checkmarkValue('url')) />
242242
{{ trans('general.url') }}
243243
</label>
244244

@@ -248,64 +248,64 @@ class="form-control"
248248
<h2>{{ trans('general.checked_out_to_fields') }}: </h2>
249249

250250
<label class="form-control">
251-
{{ Form::checkbox('assigned_to', '1', $template->checkmarkValue('assigned_to')) }}
251+
<input type="checkbox" name="assigned_to" value="1" @checked($template->checkmarkValue('assigned_to')) />
252252
{{ trans('admin/licenses/table.assigned_to') }}
253253
</label>
254254

255255
<label class="form-control">
256-
{{ Form::checkbox('username', '1', $template->checkmarkValue('username')) }}
256+
<input type="checkbox" name="username" value="1" @checked($template->checkmarkValue('username')) />
257257
{{ trans('admin/users/table.username') }}
258258
</label>
259259

260260
<label class="form-control">
261-
{{ Form::checkbox('employee_num', '1', $template->checkmarkValue('employee_num')) }}
261+
<input type="checkbox" name="employee_num" value="1" @checked($template->checkmarkValue('employee_num')) />
262262
{{ trans('general.employee_number') }}
263263
</label>
264264

265265
<label class="form-control">
266-
{{ Form::checkbox('manager', '1', $template->checkmarkValue('manager')) }}
266+
<input type="checkbox" name="manager" value="1" @checked($template->checkmarkValue('manager')) />
267267
{{ trans('admin/users/table.manager') }}
268268
</label>
269269

270270
<label class="form-control">
271-
{{ Form::checkbox('department', '1', $template->checkmarkValue('department')) }}
271+
<input type="checkbox" name="department" value="1" @checked($template->checkmarkValue('department')) />
272272
{{ trans('general.department') }}
273273
</label>
274274

275275
<label class="form-control">
276-
{{ Form::checkbox('title', '1', $template->checkmarkValue('title')) }}
276+
<input type="checkbox" name="title" value="1" @checked($template->checkmarkValue('title')) />
277277
{{ trans('admin/users/table.title') }}
278278
</label>
279279

280280
<!-- new -->
281281

282282
<label class="form-control">
283-
{{ Form::checkbox('phone', '1', $template->checkmarkValue('phone')) }}
283+
<input type="checkbox" name="phone" value="1" @checked($template->checkmarkValue('phone')) />
284284
{{ trans('admin/users/table.phone') }}
285285
</label>
286286

287287
<label class="form-control">
288-
{{ Form::checkbox('user_address', '1', $template->checkmarkValue('user_address')) }}
288+
<input type="checkbox" name="user_address" value="1" @checked($template->checkmarkValue('user_address')) />
289289
{{ trans('general.address') }}
290290
</label>
291291

292292
<label class="form-control">
293-
{{Form::checkbox('user_city', '1', $template->checkmarkValue('user_city'))}}
293+
<input type="checkbox" name="user_city" value="1" @checked($template->checkmarkValue('user_city')) />
294294
{{ trans('general.city') }}
295295
</label>
296296

297297
<label class="form-control">
298-
{{Form::checkbox('user_state', '1', $template->checkmarkValue('user_state'))}}
298+
<input type="checkbox" name="user_state" value="1" @checked($template->checkmarkValue('user_state')) />
299299
{{ trans('general.state') }}
300300
</label>
301301

302302
<label class="form-control">
303-
{{Form::checkbox('user_country', '1', $template->checkmarkValue('user_country'))}}
303+
<input type="checkbox" name="user_country" value="1" @checked($template->checkmarkValue('user_country')) />
304304
{{ trans('general.country') }}
305305
</label>
306306

307307
<label class="form-control">
308-
{{Form::checkbox('user_zip', '1', $template->checkmarkValue('user_zip'))}}
308+
<input type="checkbox" name="user_zip" value="1" @checked($template->checkmarkValue('user_zip')) />
309309
{{ trans('general.zip') }}
310310
</label>
311311

@@ -318,7 +318,7 @@ class="form-control"
318318
@foreach ($customfields as $customfield)
319319

320320
<label class="form-control">
321-
{{ Form::checkbox($customfield->db_column_name(), '1', $template->checkmarkValue($customfield->db_column_name())) }}
321+
<input type="checkbox" name="{{ $customfield->db_column_name() }}" value="1" @checked($template->checkmarkValue($customfield->db_column_name())) />
322322
{{ $customfield->name }}
323323
</label>
324324

@@ -549,13 +549,13 @@ class="form-control"
549549

550550
<div class="col-md-9 col-md-offset-3">
551551
<label class="form-control">
552-
{{ Form::checkbox('exclude_archived', '1', $template->checkmarkValue('exclude_archived', '0')) }}
552+
<input type="checkbox" name="exclude_archived" value="1" @checked($template->checkmarkValue('exclude_archived', '0')) />
553553
{{ trans('general.exclude_archived') }}
554554
</label>
555555
</div>
556556
<div class="col-md-9 col-md-offset-3">
557557
<label class="form-control">
558-
{{ Form::checkbox('use_bom', '1', $template->checkmarkValue('use_bom', '0')) }}
558+
<input type="checkbox" name="use_bom" value="1" @checked($template->checkmarkValue('use_bom', '0')) />
559559
{{ trans('general.bom_remark') }}
560560
</label>
561561
</div>

0 commit comments

Comments
 (0)