DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-07 03:47:32 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-03 08:47:57 -07:00
parent f9105719a8 c721fdd793
commit 3e2c18cb4d
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Exceptions/Handler.php
View file

@ -7,6 +7,7 @@ use Illuminate\Auth\AuthenticationException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use App\Helpers\Helper; use App\Helpers\Helper;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use Log;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
{ {
@ -34,8 +35,10 @@ class Handler extends ExceptionHandler
*/ */
public function report(Exception $exception) public function report(Exception $exception)
{ {
\Log::error($exception); // rollbar if ($this->shouldReport($exception)) {
parent::report($exception); Log::error($exception);
return parent::report($exception);
}
} }
/** /**

6
app/Importer/LicenseImporter.php
View file

@ -33,10 +33,12 @@ class LicenseImporter extends ItemImporter
public function createLicenseIfNotExists(array $row) public function createLicenseIfNotExists(array $row)
{ {
$editingLicense = false; $editingLicense = false;
$license = License::where('name', $this->item['name'])->first(); $license = License::where('name', $this->item['name'])
->where('serial', $this->item['serial'])
->first();
if ($license) { if ($license) {
if (!$this->updating) { if (!$this->updating) {
$this->log('A matching License ' . $this->item['name'] . ' already exists'); $this->log('A matching License ' . $this->item['name'] . 'with serial ' . $this->item['serial'] . ' already exists');
return; return;
} }

1
resources/views/partials/bootstrap-table.blade.php
View file

@ -54,6 +54,7 @@ $('.snipe-table').bootstrapTable({
ignoreColumn: ['actions','change','checkbox','checkincheckout','icon'], ignoreColumn: ['actions','change','checkbox','checkincheckout','icon'],
worksheetName: "Snipe-IT Export", worksheetName: "Snipe-IT Export",
jspdf: { jspdf: {
orientation: 'l',
autotable: { autotable: {
styles: { styles: {
rowHeight: 20, rowHeight: 20,