mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -08:00
Merge pull request #8605 from snipe/fixes/legacy_location_id_equals_zero
Fix for legacy location_id=0 issue that can cause failure to checkout/checkin
This commit is contained in:
commit
6ee3d0eb97
|
@ -76,9 +76,32 @@ class AssetCheckinController extends Controller
|
||||||
$asset->status_id = e($request->get('status_id'));
|
$asset->status_id = e($request->get('status_id'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// This is just meant to correct legacy issues where some user data would have 0
|
||||||
|
// as a location ID, which isn't valid. Later versions of Snipe-IT have stricter validation
|
||||||
|
// rules, so it's necessary to fix this for long-time users. It's kinda gross, but will help
|
||||||
|
// people (and their data) in the long run
|
||||||
|
|
||||||
|
if ($asset->rtd_location_id=='0') {
|
||||||
|
\Log::debug('Manually override the RTD location IDs');
|
||||||
|
\Log::debug('Original RTD Location ID: '.$asset->rtd_location_id);
|
||||||
|
$asset->rtd_location_id = '';
|
||||||
|
\Log::debug('New RTD Location ID: '.$asset->rtd_location_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($asset->location_id=='0') {
|
||||||
|
\Log::debug('Manually override the location IDs');
|
||||||
|
\Log::debug('Original Location ID: '.$asset->location_id);
|
||||||
|
$asset->location_id = '';
|
||||||
|
\Log::debug('New RTD Location ID: '.$asset->location_id);
|
||||||
|
}
|
||||||
|
|
||||||
$asset->location_id = $asset->rtd_location_id;
|
$asset->location_id = $asset->rtd_location_id;
|
||||||
|
\Log::debug('After Location ID: '.$asset->location_id);
|
||||||
|
\Log::debug('After RTD Location ID: '.$asset->rtd_location_id);
|
||||||
|
|
||||||
|
|
||||||
if ($request->filled('location_id')) {
|
if ($request->filled('location_id')) {
|
||||||
|
\Log::debug('NEW Location ID: '.$request->get('location_id'));
|
||||||
$asset->location_id = e($request->get('location_id'));
|
$asset->location_id = e($request->get('location_id'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,6 +120,6 @@ class AssetCheckinController extends Controller
|
||||||
return redirect()->route("hardware.index")->with('success', trans('admin/hardware/message.checkin.success'));
|
return redirect()->route("hardware.index")->with('success', trans('admin/hardware/message.checkin.success'));
|
||||||
}
|
}
|
||||||
// Redirect to the asset management page with error
|
// Redirect to the asset management page with error
|
||||||
return redirect()->route("hardware.index")->with('error', trans('admin/hardware/message.checkin.error'));
|
return redirect()->route("hardware.index")->with('error', trans('admin/hardware/message.checkin.error').$asset->getErrors());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,7 +80,7 @@ class AssetCheckoutController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
// Redirect to the asset management page with error
|
// Redirect to the asset management page with error
|
||||||
return redirect()->to("hardware/$assetId/checkout")->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($asset->getErrors());
|
return redirect()->to("hardware/$assetId/checkout")->with('error', trans('admin/hardware/message.checkout.error').$asset->getErrors());
|
||||||
} catch (ModelNotFoundException $e) {
|
} catch (ModelNotFoundException $e) {
|
||||||
return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($asset->getErrors());
|
return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($asset->getErrors());
|
||||||
} catch (CheckoutNotAllowed $e) {
|
} catch (CheckoutNotAllowed $e) {
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Models\Asset;
|
||||||
|
|
||||||
|
class FixZeroValuesForLocations extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
App\Models\Asset::where('location_id', '=', '0')
|
||||||
|
->update(['location_id' => null]);
|
||||||
|
|
||||||
|
App\Models\Asset::where('rtd_location_id', '=', '0')
|
||||||
|
->update(['rtd_location_id' => null]);
|
||||||
|
|
||||||
|
App\Models\User::where('location_id', '=', '0')
|
||||||
|
->update(['location_id' => null]);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue