ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2021-08-25 14:45:41 -07:00
parent 4abb9baa95 127a3e41bd
commit 085be16966
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/Helper.php
+2 -1
View File
@@ -890,7 +890,8 @@ class Helper
// If upload_max_size is less, then reduce. Except if upload_max_size is // If upload_max_size is less, then reduce. Except if upload_max_size is
// zero, which indicates no limit. // zero, which indicates no limit.
$upload_max = Helper::parse_size(ini_get('upload_max_filesize')); $upload_max = Helper::parse_size(ini_get('upload_max_filesize'));
if ($upload_max > 0 && $upload_max < $max_size) {
if ($upload_max > 0 && $upload_max < $post_max_size) {
$max_size = ini_get('upload_max_filesize'); $max_size = ini_get('upload_max_filesize');
} }
} }
app/Http/Controllers/Licenses/LicenseCheckinController.php
+7 -2
View File
@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
use App\Models\License; use App\Models\License;
use App\Models\LicenseSeat; use App\Models\LicenseSeat;
use App\Models\User; use App\Models\User;
use App\Models\Asset;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Input;
@@ -80,7 +81,12 @@ class LicenseCheckinController extends Controller
// Ooops.. something went wrong // Ooops.. something went wrong
return redirect()->back()->withInput()->withErrors($validator); return redirect()->back()->withInput()->withErrors($validator);
} }
$return_to = User::find($licenseSeat->assigned_to);
if($licenseSeat->assigned_to != null){
$return_to = User::find($licenseSeat->assigned_to);
} else {
$return_to = Asset::find($licenseSeat->asset_id);
}
// Update the asset data // Update the asset data
$licenseSeat->assigned_to = null; $licenseSeat->assigned_to = null;
@@ -88,7 +94,6 @@ class LicenseCheckinController extends Controller
// Was the asset updated? // Was the asset updated?
if ($licenseSeat->save()) { if ($licenseSeat->save()) {
event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('note'))); event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('note')));
if ($backTo=='user') { if ($backTo=='user') {