Skip to content

A free open source IT asset/license management system

Updated bulk edit forms

snipee72dba938800
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
index 4317140930..de644ee4ed 100755
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -264,8 +264,16 @@ class AccessoriesController extends Controller
{
$error = $this->runAdjustQuantity($request, $accessory, 'accessories');
- return $error
- ? redirect()->back()->with('error', $error)
- : redirect()->back()->with('success', trans('general.adjust_quantity_success'));
+ if ($error) {
+ return redirect()->back()->with('error', $error);
+ }
+
+ // Land on the item's history tab so the operator sees the log
+ // entry they just wrote as confirmation. The `history` fragment
+ // matches x-tabs.history-tab's `name="history"`.
+ return redirect()
+ ->route('accessories.show', $accessory)
+ ->withFragment('history')
+ ->with('success', trans('general.adjust_quantity_success'));
}
}
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index 0d9f2dd2a8..1d5f189af0 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -122,6 +122,7 @@ class BulkAssetsController extends Controller
'last_checkout',
'notes',
'expected_checkin',
+ 'order_number',
'image',
'assigned_to',
'created_at',
@@ -296,6 +297,7 @@ class BulkAssetsController extends Controller
|| ($request->filled('expected_checkin'))
|| ($request->filled('purchase_cost'))
|| ($request->filled('supplier_id'))
+ || ($request->filled('order_number'))
|| ($request->filled('warranty_months'))
|| ($request->filled('rtd_location_id'))
|| ($request->filled('requestable'))
@@ -330,6 +332,7 @@ class BulkAssetsController extends Controller
$this->conditionallyAddItem('name')
->conditionallyAddItem('purchase_date')
->conditionallyAddItem('expected_checkin')
+ ->conditionallyAddItem('order_number')
->conditionallyAddItem('requestable')
->conditionallyAddItem('supplier_id')
->conditionallyAddItem('warranty_months')