mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-12 16:44:08 -08:00
Merge pull request #2057 from dmeltzer/fix-settings-table-for-sqlite
Fix Settings Table for Sqlite
This commit is contained in:
commit
2c7b345ad2
|
@ -178,8 +178,6 @@ class SettingsController extends Controller
|
||||||
$settings->brand = 1;
|
$settings->brand = 1;
|
||||||
$settings->default_currency = 'USD';
|
$settings->default_currency = 'USD';
|
||||||
$settings->user_id = 1;
|
$settings->user_id = 1;
|
||||||
$settings->option_name = '135';
|
|
||||||
$settings->option_value = '1356';
|
|
||||||
|
|
||||||
if ((!$user->isValid('initial')) && (!$settings->isValid('initial'))) {
|
if ((!$user->isValid('initial')) && (!$settings->isValid('initial'))) {
|
||||||
return redirect()->back()->withInput()->withErrors($user->getErrors())->withErrors($settings->getErrors());
|
return redirect()->back()->withInput()->withErrors($user->getErrors())->withErrors($settings->getErrors());
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
|
||||||
|
class RemoveOptionKeysFromSettingsTable extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('settings', function (Blueprint $table) {
|
||||||
|
//
|
||||||
|
$table->dropColumn('option_name');
|
||||||
|
$table->dropColumn('option_value');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::table('Settings', function (Blueprint $table) {
|
||||||
|
//
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue