diff --git a/app/Console/Commands/KillAllSessions.php b/app/Console/Commands/KillAllSessions.php new file mode 100644 index 0000000000..043be0fa18 --- /dev/null +++ b/app/Console/Commands/KillAllSessions.php @@ -0,0 +1,59 @@ +option('force') && !$this->confirm("****************************************************\nTHIS WILL FORCE A LOGIN FOR ALL LOGGED IN USERS.\n\nAre you SURE you wish to continue? ")) { + return $this->error("Session loss not confirmed"); + } + + $session_files = glob(storage_path("framework/sessions/*")); + + $count = 0; + foreach ($session_files as $file) { + + if (is_file($file)) + unlink($file); + $count++; + } + \DB::table('users')->update(['remember_token' => null]); + + $this->info($count. ' sessions cleared!'); + + } +} diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.php index 0ebda27d89..fe778172c8 100644 --- a/app/Console/Commands/RestoreFromBackup.php +++ b/app/Console/Commands/RestoreFromBackup.php @@ -82,6 +82,7 @@ class RestoreFromBackup extends Command return $this->error('Could not access file: '.$filename.' - '.array_key_exists($errcode, $errors) ? $errors[$errcode] : " Unknown reason: $errcode"); } + $private_dirs = [ 'storage/private_uploads/assets', // these are asset _files_, not the pictures. 'storage/private_uploads/audits', @@ -245,19 +246,21 @@ class RestoreFromBackup extends Command return false; } $bytes_read = 0; + while (($buffer = fgets($sql_contents, self::$buffer_size)) !== false) { $bytes_read += strlen($buffer); // \Log::debug("Buffer is: '$buffer'"); $bytes_written = fwrite($pipes[0], $buffer); + if ($bytes_written === false) { $stdout = fgets($pipes[1]); $this->info($stdout); $stderr = fgets($pipes[2]); $this->info($stderr); - return false; } } + if (!feof($sql_contents) || $bytes_read == 0) { return $this->error("Not at end of file for sql file, or zero bytes read. aborting!"); } diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php index 08025567b2..a3734a042f 100644 --- a/app/Http/Controllers/Api/StatuslabelsController.php +++ b/app/Http/Controllers/Api/StatuslabelsController.php @@ -30,6 +30,20 @@ class StatuslabelsController extends Controller $statuslabels = $statuslabels->TextSearch($request->input('search')); } + + // if a status_type is passed, filter by that + if ($request->filled('status_type')) { + if (strtolower($request->input('status_type'))== 'pending') { + $statuslabels = $statuslabels->Pending(); + } elseif (strtolower($request->input('status_type'))== 'archived') { + $statuslabels = $statuslabels->Archived(); + } elseif (strtolower($request->input('status_type'))== 'deployable') { + $statuslabels = $statuslabels->Deployable(); + } elseif (strtolower($request->input('status_type'))== 'undeployable') { + $statuslabels = $statuslabels->Undeployable(); + } + } + // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which // case we override with the actual count, so we should return 0 items. $offset = (($statuslabels) && ($request->get('offset') > $statuslabels->count())) ? $statuslabels->count() : $request->get('offset', 0); diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 2125d1f6ba..c5063eb598 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -235,6 +235,7 @@ class AssetsController extends Controller ->with('statuslabel_types', Helper::statusTypeList()); } + /** * Returns a view that presents information about an asset for detail view. * @@ -309,6 +310,7 @@ class AssetsController extends Controller $asset->location_id = $request->input('rtd_location_id', null); } + if ($request->filled('image_delete')) { try { unlink(public_path().'/uploads/assets/'.$asset->image); @@ -401,6 +403,24 @@ class AssetsController extends Controller return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success')); } + /** + * Searches the assets table by serial, and redirects if it finds one + * + * @author [A. Gianotto] [] + * @since [v3.0] + * @return Redirect + */ + public function getAssetBySerial(Request $request) + { + $topsearch = ($request->get('topsearch')=="true"); + + if (!$asset = Asset::where('serial', '=', $request->get('serial'))->first()) { + return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); + } + $this->authorize('view', $asset); + return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch); + } + /** * Searches the assets table by asset tag, and redirects if it finds one * @@ -420,6 +440,7 @@ class AssetsController extends Controller return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch); } + /** * Return a QR code for the asset * @@ -792,6 +813,7 @@ class AssetsController extends Controller return view('hardware/audit-overdue'); } + public function auditStore(Request $request, $id) { $this->authorize('audit', Asset::class); @@ -822,6 +844,7 @@ class AssetsController extends Controller $asset->location_id = $request->input('location_id'); } + if ($asset->save()) { $file_name = ''; // Upload an image, if attached diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 5bcf6fd8e6..742c8013d9 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -4,6 +4,7 @@ namespace App\Http\Transformers; use App\Helpers\Helper; use App\Models\Asset; +use App\Models\Setting; use Gate; use Illuminate\Database\Eloquent\Collection; @@ -21,6 +22,9 @@ class AssetsTransformer public function transformAsset(Asset $asset) { + // This uses the getSettings() method so we're pulling from the cache versus querying the settings on single asset + $setting = Setting::getSettings(); + $array = [ 'id' => (int) $asset->id, 'name' => e($asset->name), @@ -65,6 +69,8 @@ class AssetsTransformer 'name'=> e($asset->defaultLoc->name), ] : null, 'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null, + 'qr' => ($setting->qr_code=='1') ? config('app.url').'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png' : null, + 'alt_barcode' => ($setting->alt_barcode_enabled=='1') ? config('app.url').'/uploads/barcodes/'.str_slug($setting->alt_barcode).'-'.str_slug($asset->asset_tag).'.png' : null, 'assigned_to' => $this->transformAssignedTo($asset), 'warranty_months' => ($asset->warranty_months > 0) ? e($asset->warranty_months.' '.trans('admin/hardware/form.months')) : null, 'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null, diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php index 9f635cd3fd..7fe5231985 100644 --- a/app/Importer/AssetImporter.php +++ b/app/Importer/AssetImporter.php @@ -97,10 +97,12 @@ class AssetImporter extends ItemImporter $item['rtd_location_id'] = $this->item['location_id']; } + $item['last_audit_date'] = null; if (isset($this->item['last_audit_date'])) { $item['last_audit_date'] = $this->item['last_audit_date']; } + $item['next_audit_date'] = null; if (isset($this->item['next_audit_date'])) { $item['next_audit_date'] = $this->item['next_audit_date']; } diff --git a/app/Importer/LicenseImporter.php b/app/Importer/LicenseImporter.php index 94adbd5ee5..358164313f 100644 --- a/app/Importer/LicenseImporter.php +++ b/app/Importer/LicenseImporter.php @@ -47,14 +47,22 @@ class LicenseImporter extends ItemImporter $license = new License; } $asset_tag = $this->item['asset_tag'] = $this->findCsvMatch($row, 'asset_tag'); // used for checkout out to an asset. - $this->item['expiration_date'] = $this->findCsvMatch($row, 'expiration_date'); + + $this->item["expiration_date"] = null; + if ($this->findCsvMatch($row, "expiration_date")!='') { + $this->item["expiration_date"] = date("Y-m-d 00:00:01", strtotime($this->findCsvMatch($row, "expiration_date"))); + } $this->item['license_email'] = $this->findCsvMatch($row, 'license_email'); $this->item['license_name'] = $this->findCsvMatch($row, 'license_name'); $this->item['maintained'] = $this->findCsvMatch($row, 'maintained'); $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order'); $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable'); $this->item['seats'] = $this->findCsvMatch($row, 'seats'); - $this->item['termination_date'] = $this->findCsvMatch($row, 'termination_date'); + + $this->item["termination_date"] = null; + if ($this->findCsvMatch($row, "termination_date")!='') { + $this->item["termination_date"] = date("Y-m-d 00:00:01", strtotime($this->findCsvMatch($row, "termination_date"))); + } if ($editingLicense) { $license->update($this->sanitizeItemForUpdating($license)); diff --git a/app/Models/Statuslabel.php b/app/Models/Statuslabel.php index da856b4b7f..0f8a0b6075 100755 --- a/app/Models/Statuslabel.php +++ b/app/Models/Statuslabel.php @@ -120,6 +120,18 @@ class Statuslabel extends SnipeModel ->where('deployable', '=', 1); } + /** + * Query builder scope for undeployable status types + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ + public function scopeUndeployable() + { + return $this->where('pending', '=', 0) + ->where('archived', '=', 0) + ->where('deployable', '=', 0); + } + /** * Helper function to determine type attributes * diff --git a/config/version.php b/config/version.php index 36f91f656b..c9ff26503d 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v6.0.0-RC-4', - 'full_app_version' => 'v6.0.0-RC-4 - build 6754-gafd83311a', - 'build_version' => '6754', + 'app_version' => 'v6.0.0-RC-5', + 'full_app_version' => 'v6.0.0-RC-5 - build 6772-g7cbcd2d95', + 'build_version' => '6772', 'prerelease_version' => '', - 'hash_version' => 'gafd83311a', - 'full_hash' => 'v6.0.0-RC-4-1-gafd83311a', - 'branch' => 'develop', + 'hash_version' => 'g7cbcd2d95', + 'full_hash' => 'v6.0.0-RC-5-19-g7cbcd2d95', + 'branch' => 'merges/master_down_to_develop_march_16', ); \ No newline at end of file diff --git a/database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php b/database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php index adc9477b37..7f0d2d3c01 100644 --- a/database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php +++ b/database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php @@ -13,20 +13,22 @@ class CreateCheckoutAcceptancesTable extends Migration */ public function up() { - Schema::create('checkout_acceptances', function (Blueprint $table) { - $table->increments('id'); + if (!Schema::hasTable('checkout_acceptances')) { + Schema::create('checkout_acceptances', function (Blueprint $table) { + $table->increments('id'); - $table->morphs('checkoutable'); - $table->integer('assigned_to_id')->nullable(); + $table->morphs('checkoutable'); + $table->integer('assigned_to_id')->nullable(); - $table->string('signature_filename')->nullable(); + $table->string('signature_filename')->nullable(); - $table->timestamp('accepted_at')->nullable(); - $table->timestamp('declined_at')->nullable(); + $table->timestamp('accepted_at')->nullable(); + $table->timestamp('declined_at')->nullable(); - $table->timestamps(); - $table->softDeletes(); - }); + $table->timestamps(); + $table->softDeletes(); + }); + } } /** @@ -36,6 +38,8 @@ class CreateCheckoutAcceptancesTable extends Migration */ public function down() { - Schema::dropIfExists('checkout_acceptances'); + if (Schema::hasTable('checkout_acceptances')) { + Schema::dropIfExists('checkout_acceptances'); + } } } diff --git a/database/migrations/2018_10_18_191228_add_kits_licenses_table.php b/database/migrations/2018_10_18_191228_add_kits_licenses_table.php index 4942942121..470f67803c 100644 --- a/database/migrations/2018_10_18_191228_add_kits_licenses_table.php +++ b/database/migrations/2018_10_18_191228_add_kits_licenses_table.php @@ -1,7 +1,9 @@ increments('id'); - $table->integer('kit_id')->nullable()->default(null); - $table->integer('license_id')->nullable()->default(null); - $table->integer('quantity')->default(1); - $table->timestamps(); - }); - } + if (!Schema::hasTable('kits_licenses')) { + Schema::create('kits_licenses', function ($table) { + $table->increments('id'); + $table->integer('kit_id')->nullable()->default(null); + $table->integer('license_id')->nullable()->default(null); + $table->integer('quantity')->default(1); + $table->timestamps(); + }); + } + } /** * Reverse the migrations. @@ -29,7 +32,9 @@ class AddKitsLicensesTable extends Migration */ public function down() { - // - Schema::drop('kits_licenses'); - } + if (Schema::hasTable('kits_licenses')) { + Schema::drop('kits_licenses'); + } + } + } diff --git a/database/migrations/2018_10_19_153910_add_kits_table.php b/database/migrations/2018_10_19_153910_add_kits_table.php index 04e9290aba..fbc683f180 100644 --- a/database/migrations/2018_10_19_153910_add_kits_table.php +++ b/database/migrations/2018_10_19_153910_add_kits_table.php @@ -1,7 +1,8 @@ increments('id'); - $table->string('name')->nullable()->default(null); - $table->timestamps(); - $table->engine = 'InnoDB'; - }); - } + if (!Schema::hasTable('kits')) { + Schema::create('kits', function ($table) { + $table->increments('id'); + $table->string('name')->nullable()->default(null); + $table->timestamps(); + $table->engine = 'InnoDB'; + }); + } + + } /** * Reverse the migrations. @@ -28,7 +31,9 @@ class AddKitsTable extends Migration */ public function down() { - // - Schema::drop('kits'); - } + if (Schema::hasTable('kits')) { + Schema::drop('kits'); + } + } + } diff --git a/database/migrations/2018_10_19_154013_add_kits_models_table.php b/database/migrations/2018_10_19_154013_add_kits_models_table.php index 0f62dd45ef..3b5224c6bc 100644 --- a/database/migrations/2018_10_19_154013_add_kits_models_table.php +++ b/database/migrations/2018_10_19_154013_add_kits_models_table.php @@ -1,7 +1,9 @@ increments('id'); - $table->integer('kit_id')->nullable()->default(null); - $table->integer('model_id')->nullable()->default(null); - $table->integer('quantity')->default(1); - $table->timestamps(); - }); - } + if (!Schema::hasTable('kits_models')) { + Schema::create('kits_models', function ($table) { + $table->increments('id'); + $table->integer('kit_id')->nullable()->default(null); + $table->integer('model_id')->nullable()->default(null); + $table->integer('quantity')->default(1); + $table->timestamps(); + }); + } + } /** * Reverse the migrations. @@ -29,7 +32,8 @@ class AddKitsModelsTable extends Migration */ public function down() { - // - Schema::drop('kits_models'); + if (Schema::hasTable('kits_models')) { + Schema::drop('kits_models'); + } } } diff --git a/database/migrations/2019_02_07_185953_add_kits_consumables_table.php b/database/migrations/2019_02_07_185953_add_kits_consumables_table.php index c1fb46c23e..34fbb3539b 100644 --- a/database/migrations/2019_02_07_185953_add_kits_consumables_table.php +++ b/database/migrations/2019_02_07_185953_add_kits_consumables_table.php @@ -1,8 +1,8 @@ increments('id'); - $table->integer('kit_id')->nullable()->default(null); - $table->integer('consumable_id')->nullable()->default(null); - $table->integer('quantity')->default(1); - $table->timestamps(); - }); + if (!Schema::hasTable('kits_consumables')) { + Schema::create('kits_consumables', function ($table) { + $table->increments('id'); + $table->integer('kit_id')->nullable()->default(null); + $table->integer('consumable_id')->nullable()->default(null); + $table->integer('quantity')->default(1); + $table->timestamps(); + }); + } } /** @@ -30,7 +31,8 @@ class AddKitsConsumablesTable extends Migration */ public function down() { - // - Schema::drop('kits_consumables'); + if (Schema::hasTable('kits_consumables')) { + Schema::drop('kits_consumables'); + } } } diff --git a/database/migrations/2019_02_07_190030_add_kits_accessories_table.php b/database/migrations/2019_02_07_190030_add_kits_accessories_table.php index 12e20beba2..1a4e14af94 100644 --- a/database/migrations/2019_02_07_190030_add_kits_accessories_table.php +++ b/database/migrations/2019_02_07_190030_add_kits_accessories_table.php @@ -1,8 +1,8 @@ increments('id'); - $table->integer('kit_id')->nullable()->default(null); - $table->integer('accessory_id')->nullable()->default(null); - $table->integer('quantity')->default(1); - $table->timestamps(); - }); + if (!Schema::hasTable('kits_accessories')) { + Schema::create('kits_accessories', function ($table) { + $table->increments('id'); + $table->integer('kit_id')->nullable()->default(null); + $table->integer('accessory_id')->nullable()->default(null); + $table->integer('quantity')->default(1); + $table->timestamps(); + }); + } } /** @@ -30,7 +31,8 @@ class AddKitsAccessoriesTable extends Migration */ public function down() { - // - Schema::drop('kits_accessories'); + if (Schema::hasTable('kits_accessories')) { + Schema::drop('kits_accessories'); + } } } diff --git a/package-lock.json b/package-lock.json index 2456834063..08a6742dde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15662,7 +15662,7 @@ "jquery": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha1-xyoJ8Vwb3OFC9J2/EXC9+K2sJHA=" + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" }, "jquery-form-validator": { "version": "2.3.79", diff --git a/resources/assets/js/snipeit_modals.js b/resources/assets/js/snipeit_modals.js index 4dbdc68fe1..8e313017a1 100644 --- a/resources/assets/js/snipeit_modals.js +++ b/resources/assets/js/snipeit_modals.js @@ -26,7 +26,7 @@ $(function () { - + var baseUrl = $('meta[name="baseUrl"]').attr('content'); //handle modal-add-interstitial calls var model, select, refreshSelector; diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less index d8bd296aec..e4c48a2b3b 100644 --- a/resources/assets/less/skins/skin-black-dark.less +++ b/resources/assets/less/skins/skin-black-dark.less @@ -26,7 +26,7 @@ color: #fff; } a { - color: #fff; + color: #333; &:hover { background: darken(@black, 5%); color: #fff; @@ -36,6 +36,11 @@ } } } + @media (max-width: 991px) { + .navbar-custom-menu > .navbar-nav > li > .dropdown-menu { + background-color: var(--back-sub); + } + } //Logo li.user-header { @@ -245,10 +250,6 @@ body { #details>div>div>div>table { background-color: transparent; } -.dropdown-menu, .dropdown-menu>li>a { - background-color: var(--back-sub); - color: var(--text-main) !important; -} .dropdown-menu>li>a:hover { background-color: var(--back-main); color: var(--nav-link); diff --git a/resources/assets/less/skins/skin-black.less b/resources/assets/less/skins/skin-black.less index b1660b26b4..5db57608f0 100755 --- a/resources/assets/less/skins/skin-black.less +++ b/resources/assets/less/skins/skin-black.less @@ -25,7 +25,7 @@ background-color: rgba(255, 255, 255, 0.1); } a { - color: #fff; + color: #333; &:hover { background: darken(@black, 5%); } diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less index 1d89cb9fad..225c662382 100644 --- a/resources/assets/less/skins/skin-blue-dark.less +++ b/resources/assets/less/skins/skin-blue-dark.less @@ -232,10 +232,6 @@ body { #details>div>div>div>table { background-color: transparent; } -.dropdown-menu, .dropdown-menu>li>a { - background-color: var(--back-sub); - color: var(--text-main) !important; -} .dropdown-menu>li>a:hover { background-color: var(--back-main); color: var(--nav-link); diff --git a/resources/assets/less/skins/skin-blue.less b/resources/assets/less/skins/skin-blue.less index 1644faeaa1..dc02aeab37 100755 --- a/resources/assets/less/skins/skin-blue.less +++ b/resources/assets/less/skins/skin-blue.less @@ -25,7 +25,7 @@ background-color: rgba(255, 255, 255, 0.1); } a { - color: #fff; + color: #333; &:hover { background: darken(@light-blue, 5%); } diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less index 9f03940338..6ccaf30388 100644 --- a/resources/assets/less/skins/skin-green-dark.less +++ b/resources/assets/less/skins/skin-green-dark.less @@ -232,10 +232,6 @@ body { #details>div>div>div>table { background-color: transparent; } -.dropdown-menu, .dropdown-menu>li>a { - background-color: var(--back-sub); - color: var(--text-main) !important; -} .dropdown-menu>li>a:hover { background-color: var(--back-main); color: var(--nav-link); diff --git a/resources/assets/less/skins/skin-green.less b/resources/assets/less/skins/skin-green.less index 0c0a9bdbc3..b0f38c557d 100755 --- a/resources/assets/less/skins/skin-green.less +++ b/resources/assets/less/skins/skin-green.less @@ -25,7 +25,7 @@ background-color: rgba(255, 255, 255, 0.1); } a { - color: #fff; + color: #333; &:hover { background: darken(@green, 5%); } diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less index 79342a8fe6..405f10fc59 100644 --- a/resources/assets/less/skins/skin-orange-dark.less +++ b/resources/assets/less/skins/skin-orange-dark.less @@ -234,10 +234,6 @@ a:link.btn-default{ #details>div>div>div>table { background-color: transparent; } -.dropdown-menu, .dropdown-menu>li>a { - background-color: var(--back-sub); - color: var(--text-main) !important; -} .dropdown-menu>li>a:hover { background-color: var(--back-main); color: var(--nav-link); diff --git a/resources/assets/less/skins/skin-orange.less b/resources/assets/less/skins/skin-orange.less index fb66309249..89e5ac9d24 100644 --- a/resources/assets/less/skins/skin-orange.less +++ b/resources/assets/less/skins/skin-orange.less @@ -25,7 +25,7 @@ background-color: rgba(255, 255, 255, 0.1); } a { - color: #fff; + color: #333; &:hover { background: darken(@orange, 5%); } diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less index 16987b41a0..3c77639c43 100644 --- a/resources/assets/less/skins/skin-purple-dark.less +++ b/resources/assets/less/skins/skin-purple-dark.less @@ -234,10 +234,6 @@ body { #details>div>div>div>table { background-color: transparent; } -.dropdown-menu, .dropdown-menu>li>a { - background-color: var(--back-sub); - color: var(--text-main) !important; -} .dropdown-menu>li>a:hover { background-color: var(--back-main); color: var(--nav-link); diff --git a/resources/assets/less/skins/skin-purple.less b/resources/assets/less/skins/skin-purple.less index 4c4accd594..1edaff0677 100755 --- a/resources/assets/less/skins/skin-purple.less +++ b/resources/assets/less/skins/skin-purple.less @@ -25,7 +25,7 @@ background-color: rgba(255, 255, 255, 0.1); } a { - color: #fff; + color: #333; &:hover { background: darken(@purple, 5%); } diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index b36d751146..651d261520 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -233,10 +233,6 @@ body { #details>div>div>div>table { background-color: transparent; } -.dropdown-menu, .dropdown-menu>li>a { - background-color: var(--back-sub); - color: var(--text-main) !important; -} .dropdown-menu>li>a:hover { background-color: var(--back-main); color: var(--nav-link); diff --git a/resources/assets/less/skins/skin-red.less b/resources/assets/less/skins/skin-red.less index e53f812c5b..c2383d0de0 100755 --- a/resources/assets/less/skins/skin-red.less +++ b/resources/assets/less/skins/skin-red.less @@ -25,7 +25,7 @@ background-color: rgba(255, 255, 255, 0.1); } a { - color: #fff; + color: #333; &:hover { background: darken(@red, 5%); } diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less index 1fb5837812..9fd0d94aa0 100644 --- a/resources/assets/less/skins/skin-yellow-dark.less +++ b/resources/assets/less/skins/skin-yellow-dark.less @@ -234,10 +234,6 @@ body { #details>div>div>div>table { background-color: transparent; } -.dropdown-menu, .dropdown-menu>li>a { - background-color: var(--back-sub); - color: var(--text-main) !important; -} .dropdown-menu>li>a:hover { background-color: var(--back-main); color: var(--nav-link); diff --git a/resources/assets/less/skins/skin-yellow.less b/resources/assets/less/skins/skin-yellow.less index c6ecc5c7bf..b8c5de92c3 100755 --- a/resources/assets/less/skins/skin-yellow.less +++ b/resources/assets/less/skins/skin-yellow.less @@ -25,7 +25,7 @@ background-color: rgba(255, 255, 255, 0.1); } a { - color: #fff; + color: #333; &:hover { background: darken(@yellow, 5%); } diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index d7b948604e..7bc948960b 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -459,6 +459,7 @@ @else {!! nl2br(e($asset->{$field->db_column_name()})) !!}   @endif + @endif diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 5c638735f6..72927026ae 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -53,7 +53,7 @@ paginationLastText: "{{ trans('general.last') }}", paginationPreText: "{{ trans('general.previous') }}", paginationNextText: "{{ trans('general.next') }}", - pageList: ['10','20', '30','50','100','150','200', '500', '1000'], + pageList: ['10','20', '30','50','100','150','200'{!! ((config('app.max_results') > 200) ? ",'500'" : '') !!}{!! ((config('app.max_results') > 500) ? ",'".config('app.max_results')."'" : '') !!}], pageSize: {{ (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }}, paginationVAlign: 'both', queryParams: function (params) { diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index a1f802032f..27f824b694 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -230,7 +230,7 @@ {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }} @endif - {{ ($consumable->category) ? $consumable->category->name : '{{ trans('general.invalid_category') }}' }} + {{ ($consumable->category) ? $consumable->category->name : trans('general.invalid_category') }} {{ $consumable->assetlog->first()->created_at }} @php