Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6353 from turbo124/v5-develop

Browse Source 
Fixes for locking
This commit is contained in:
David Bomba 2021-07-28 16:01:51 +10:00 committed by GitHub
commit eb06d0e3ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/PreviewController.php
View File

@ -191,6 +191,8 @@ class PreviewController extends BaseController
DB::connection(config('database.default'))->beginTransaction(); DB::connection(config('database.default'))->beginTransaction();
try {
if($request->has('entity_id')){ if($request->has('entity_id')){
$entity_obj = $class::withTrashed()->whereId($this->decodePrimaryKey($request->input('entity_id')))->company()->first(); $entity_obj = $class::withTrashed()->whereId($this->decodePrimaryKey($request->input('entity_id')))->company()->first();
@ -252,6 +254,12 @@ class PreviewController extends BaseController
if (request()->query('html') == 'true') { if (request()->query('html') == 'true') {
return $maker->getCompiledHTML; return $maker->getCompiledHTML;
} }
}
catch(\Exception $e){
DB::connection(config('database.default'))->rollBack();
}
DB::connection(config('database.default'))->rollBack(); DB::connection(config('database.default'))->rollBack();