We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -1,12 +1,8 @@ |
||
1 | 1 | <?php namespace Backpack\Settings\app\Http\Controllers; |
2 | 2 | |
3 | -use Illuminate\Http\Request; |
|
4 | -use App\Http\Requests; |
|
5 | -use App\Http\Controllers\Controller; |
|
6 | 3 | use Backpack\CRUD\app\Http\Controllers\CrudController; |
7 | 4 | |
8 | 5 | // VALIDATION |
9 | -use Backpack\Settings\app\Http\Requests\SettingRequest as StoreRequest; |
|
10 | 6 | use Backpack\Settings\app\Http\Requests\SettingRequest as UpdateRequest; |
11 | 7 | |
12 | 8 | class SettingCrudController extends CrudController { |
@@ -88,8 +88,7 @@ discard block |
||
88 | 88 | if (view()->exists('vendor.dick.crud.list')) |
89 | 89 | { |
90 | 90 | return view('vendor.dick.crud.list', $this->data); |
91 | - } |
|
92 | - else |
|
91 | + } else |
|
93 | 92 | { |
94 | 93 | return view('crud::list', $this->data); |
95 | 94 | } |
@@ -134,8 +133,7 @@ discard block |
||
134 | 133 | if (view()->exists('vendor.dick.crud.edit')) |
135 | 134 | { |
136 | 135 | return view('vendor.dick.crud.edit', $this->data); |
137 | - } |
|
138 | - else |
|
136 | + } else |
|
139 | 137 | { |
140 | 138 | return view('crud::edit', $this->data); |
141 | 139 | } |
@@ -6,50 +6,50 @@ |
||
6 | 6 | |
7 | 7 | class SettingsTableSeeder extends Seeder |
8 | 8 | { |
9 | - /** |
|
10 | - * Run the database seeds. |
|
11 | - * |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function run() |
|
15 | - { |
|
16 | - DB::table('settings')->insert([ |
|
17 | - 'key' => 'contact_email', |
|
18 | - 'name' => 'Contact form email address', |
|
19 | - 'description' => 'The email address that all emails from the contact form will go to.', |
|
20 | - 'value' => '[email protected]', |
|
21 | - 'field' => '', |
|
22 | - 'active' => 1 |
|
23 | - ]); |
|
24 | - |
|
25 | - DB::table('settings')->insert([ |
|
26 | - 'key' => 'contact_cc', |
|
27 | - 'name' => 'Contact form CC field', |
|
28 | - 'description' => 'Email adresses separated by comma, to be included as CC in the email sent by the contact form.', |
|
29 | - 'value' => '', |
|
30 | - 'field' => '', |
|
31 | - 'active' => 1 |
|
32 | - |
|
33 | - ]); |
|
34 | - |
|
35 | - DB::table('settings')->insert([ |
|
36 | - 'key' => 'contact_bcc', |
|
37 | - 'name' => 'Contact form BCC field', |
|
38 | - 'description' => 'Email adresses separated by comma, to be included as BCC in the email sent by the contact form.', |
|
39 | - 'value' => '', |
|
40 | - 'field' => '{\"name\":\"value\",\"label\":\"Value\",\"type\":\"email\"}', |
|
41 | - 'active' => 1 |
|
42 | - |
|
43 | - ]); |
|
44 | - |
|
45 | - DB::table('settings')->insert([ |
|
46 | - 'key' => 'motto', |
|
47 | - 'name' => 'Motto', |
|
48 | - 'description' => 'Website motto', |
|
49 | - 'value' => 'this is the value', |
|
50 | - 'field' => '{\"name\":\"value\",\"label\":\"Value\", \"title\":\"Motto value\" ,\"type\":\"textarea\"}', |
|
51 | - 'active' => 1 |
|
52 | - |
|
53 | - ]); |
|
54 | - } |
|
9 | + /** |
|
10 | + * Run the database seeds. |
|
11 | + * |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function run() |
|
15 | + { |
|
16 | + DB::table('settings')->insert([ |
|
17 | + 'key' => 'contact_email', |
|
18 | + 'name' => 'Contact form email address', |
|
19 | + 'description' => 'The email address that all emails from the contact form will go to.', |
|
20 | + 'value' => '[email protected]', |
|
21 | + 'field' => '', |
|
22 | + 'active' => 1 |
|
23 | + ]); |
|
24 | + |
|
25 | + DB::table('settings')->insert([ |
|
26 | + 'key' => 'contact_cc', |
|
27 | + 'name' => 'Contact form CC field', |
|
28 | + 'description' => 'Email adresses separated by comma, to be included as CC in the email sent by the contact form.', |
|
29 | + 'value' => '', |
|
30 | + 'field' => '', |
|
31 | + 'active' => 1 |
|
32 | + |
|
33 | + ]); |
|
34 | + |
|
35 | + DB::table('settings')->insert([ |
|
36 | + 'key' => 'contact_bcc', |
|
37 | + 'name' => 'Contact form BCC field', |
|
38 | + 'description' => 'Email adresses separated by comma, to be included as BCC in the email sent by the contact form.', |
|
39 | + 'value' => '', |
|
40 | + 'field' => '{\"name\":\"value\",\"label\":\"Value\",\"type\":\"email\"}', |
|
41 | + 'active' => 1 |
|
42 | + |
|
43 | + ]); |
|
44 | + |
|
45 | + DB::table('settings')->insert([ |
|
46 | + 'key' => 'motto', |
|
47 | + 'name' => 'Motto', |
|
48 | + 'description' => 'Website motto', |
|
49 | + 'value' => 'this is the value', |
|
50 | + 'field' => '{\"name\":\"value\",\"label\":\"Value\", \"title\":\"Motto value\" ,\"type\":\"textarea\"}', |
|
51 | + 'active' => 1 |
|
52 | + |
|
53 | + ]); |
|
54 | + } |
|
55 | 55 | } |
@@ -5,32 +5,32 @@ |
||
5 | 5 | |
6 | 6 | class CreateSettingsTable extends Migration |
7 | 7 | { |
8 | - /** |
|
9 | - * Run the migrations. |
|
10 | - * |
|
11 | - * @return void |
|
12 | - */ |
|
13 | - public function up() |
|
14 | - { |
|
15 | - Schema::create('settings', function (Blueprint $table) { |
|
16 | - $table->increments('id'); |
|
17 | - $table->string('key'); |
|
18 | - $table->string('name'); |
|
19 | - $table->string('description')->nullable(); |
|
20 | - $table->string('value')->nullable(); |
|
21 | - $table->text('field'); |
|
22 | - $table->tinyInteger('active'); |
|
23 | - $table->timestamps(); |
|
24 | - }); |
|
25 | - } |
|
8 | + /** |
|
9 | + * Run the migrations. |
|
10 | + * |
|
11 | + * @return void |
|
12 | + */ |
|
13 | + public function up() |
|
14 | + { |
|
15 | + Schema::create('settings', function (Blueprint $table) { |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('key'); |
|
18 | + $table->string('name'); |
|
19 | + $table->string('description')->nullable(); |
|
20 | + $table->string('value')->nullable(); |
|
21 | + $table->text('field'); |
|
22 | + $table->tinyInteger('active'); |
|
23 | + $table->timestamps(); |
|
24 | + }); |
|
25 | + } |
|
26 | 26 | |
27 | - /** |
|
28 | - * Reverse the migrations. |
|
29 | - * |
|
30 | - * @return void |
|
31 | - */ |
|
32 | - public function down() |
|
33 | - { |
|
34 | - Schema::drop("settings"); |
|
35 | - } |
|
27 | + /** |
|
28 | + * Reverse the migrations. |
|
29 | + * |
|
30 | + * @return void |
|
31 | + */ |
|
32 | + public function down() |
|
33 | + { |
|
34 | + Schema::drop("settings"); |
|
35 | + } |
|
36 | 36 | } |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('settings', function (Blueprint $table) { |
|
15 | + Schema::create('settings', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('key'); |
18 | 18 | $table->string('name'); |
@@ -9,68 +9,68 @@ |
||
9 | 9 | |
10 | 10 | class SettingsServiceProvider extends ServiceProvider |
11 | 11 | { |
12 | - /** |
|
13 | - * Indicates if loading of the provider is deferred. |
|
14 | - * |
|
15 | - * @var bool |
|
16 | - */ |
|
17 | - protected $defer = false; |
|
18 | - /** |
|
19 | - * Perform post-registration booting of services. |
|
20 | - * |
|
21 | - * @return void |
|
22 | - */ |
|
23 | - public function boot() |
|
24 | - { |
|
25 | - // only use the Settings package if the Settings table is present in the database |
|
26 | - if (count(DB::select("SHOW TABLES LIKE 'settings'"))) |
|
27 | - { |
|
28 | - // get all settings from the database |
|
29 | - $settings = Setting::all(); |
|
12 | + /** |
|
13 | + * Indicates if loading of the provider is deferred. |
|
14 | + * |
|
15 | + * @var bool |
|
16 | + */ |
|
17 | + protected $defer = false; |
|
18 | + /** |
|
19 | + * Perform post-registration booting of services. |
|
20 | + * |
|
21 | + * @return void |
|
22 | + */ |
|
23 | + public function boot() |
|
24 | + { |
|
25 | + // only use the Settings package if the Settings table is present in the database |
|
26 | + if (count(DB::select("SHOW TABLES LIKE 'settings'"))) |
|
27 | + { |
|
28 | + // get all settings from the database |
|
29 | + $settings = Setting::all(); |
|
30 | 30 | |
31 | - // bind all settings to the Laravel config, so you can call them like |
|
32 | - // Config::get('settings.contact_email') |
|
33 | - foreach ($settings as $key => $setting) { |
|
34 | - Config::set('settings.'.$setting->key, $setting->value); |
|
35 | - } |
|
36 | - } |
|
31 | + // bind all settings to the Laravel config, so you can call them like |
|
32 | + // Config::get('settings.contact_email') |
|
33 | + foreach ($settings as $key => $setting) { |
|
34 | + Config::set('settings.'.$setting->key, $setting->value); |
|
35 | + } |
|
36 | + } |
|
37 | 37 | |
38 | - // publish the migrations and seeds |
|
39 | - $this->publishes([ __DIR__.'/database/migrations/' => database_path('migrations') ], 'migrations'); |
|
40 | - $this->publishes([ __DIR__.'/database/seeds/' => database_path('seeds') ], 'seeds'); |
|
41 | - } |
|
42 | - /** |
|
43 | - * Define the routes for the application. |
|
44 | - * |
|
45 | - * @param \Illuminate\Routing\Router $router |
|
46 | - * @return void |
|
47 | - */ |
|
48 | - public function setupRoutes(Router $router) |
|
49 | - { |
|
50 | - $router->group(['namespace' => 'Backpack\Settings\app\Http\Controllers'], function($router) |
|
51 | - { |
|
52 | - require __DIR__.'/app/Http/routes.php'; |
|
53 | - }); |
|
54 | - } |
|
55 | - /** |
|
56 | - * Register any package services. |
|
57 | - * |
|
58 | - * @return void |
|
59 | - */ |
|
60 | - public function register() |
|
61 | - { |
|
62 | - $this->registerSettings(); |
|
63 | - $this->setupRoutes($this->app->router); |
|
38 | + // publish the migrations and seeds |
|
39 | + $this->publishes([ __DIR__.'/database/migrations/' => database_path('migrations') ], 'migrations'); |
|
40 | + $this->publishes([ __DIR__.'/database/seeds/' => database_path('seeds') ], 'seeds'); |
|
41 | + } |
|
42 | + /** |
|
43 | + * Define the routes for the application. |
|
44 | + * |
|
45 | + * @param \Illuminate\Routing\Router $router |
|
46 | + * @return void |
|
47 | + */ |
|
48 | + public function setupRoutes(Router $router) |
|
49 | + { |
|
50 | + $router->group(['namespace' => 'Backpack\Settings\app\Http\Controllers'], function($router) |
|
51 | + { |
|
52 | + require __DIR__.'/app/Http/routes.php'; |
|
53 | + }); |
|
54 | + } |
|
55 | + /** |
|
56 | + * Register any package services. |
|
57 | + * |
|
58 | + * @return void |
|
59 | + */ |
|
60 | + public function register() |
|
61 | + { |
|
62 | + $this->registerSettings(); |
|
63 | + $this->setupRoutes($this->app->router); |
|
64 | 64 | |
65 | - // use this if your package has a config file |
|
66 | - // config([ |
|
67 | - // 'config/Settings.php', |
|
68 | - // ]); |
|
69 | - } |
|
70 | - private function registerSettings() |
|
71 | - { |
|
72 | - $this->app->bind('settings',function($app){ |
|
73 | - return new Settings($app); |
|
74 | - }); |
|
75 | - } |
|
65 | + // use this if your package has a config file |
|
66 | + // config([ |
|
67 | + // 'config/Settings.php', |
|
68 | + // ]); |
|
69 | + } |
|
70 | + private function registerSettings() |
|
71 | + { |
|
72 | + $this->app->bind('settings',function($app){ |
|
73 | + return new Settings($app); |
|
74 | + }); |
|
75 | + } |
|
76 | 76 | } |
77 | 77 | \ No newline at end of file |
@@ -36,8 +36,8 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | // publish the migrations and seeds |
39 | - $this->publishes([ __DIR__.'/database/migrations/' => database_path('migrations') ], 'migrations'); |
|
40 | - $this->publishes([ __DIR__.'/database/seeds/' => database_path('seeds') ], 'seeds'); |
|
39 | + $this->publishes([__DIR__.'/database/migrations/' => database_path('migrations')], 'migrations'); |
|
40 | + $this->publishes([__DIR__.'/database/seeds/' => database_path('seeds')], 'seeds'); |
|
41 | 41 | } |
42 | 42 | /** |
43 | 43 | * Define the routes for the application. |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | private function registerSettings() |
71 | 71 | { |
72 | - $this->app->bind('settings',function($app){ |
|
72 | + $this->app->bind('settings', function($app) { |
|
73 | 73 | return new Settings($app); |
74 | 74 | }); |
75 | 75 | } |
@@ -1,11 +1,10 @@ |
||
1 | 1 | <?php namespace Backpack\Settings; |
2 | 2 | |
3 | -use Illuminate\Routing\Router; |
|
4 | -use Illuminate\Support\ServiceProvider; |
|
5 | -use Illuminate\Support\Facades\DB; |
|
6 | -use Illuminate\Database\Eloquent\Model as Eloquent; |
|
7 | 3 | use Backpack\Settings\app\Models\Setting as Setting; |
8 | 4 | use Config; |
5 | +use Illuminate\Routing\Router; |
|
6 | +use Illuminate\Support\Facades\DB; |
|
7 | +use Illuminate\Support\ServiceProvider; |
|
9 | 8 | |
10 | 9 | class SettingsServiceProvider extends ServiceProvider |
11 | 10 | { |