Setup changes #4813
Merged
Setup changes #4813
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
snipe
reviewed
Jan 17, 2018
| $settings->site_name = e(Input::get('site_name')); | ||
| $settings->alert_email = e(Input::get('email')); | ||
| $settings->alerts_enabled = 1; | ||
| $settings->pwd_secure_min = 10; | ||
| $settings->brand = 1; | ||
| $settings->locale = 'en'; | ||
| $settings->default_currency = 'USD'; | ||
| $settings->locale = e(Input::get('locale')); |
There was a problem hiding this comment.
I think we need to set a default for locale (en)) and full_multiple_companies_support, here, or make those fields required via FormRequest.
Also, since we use prepared statements, we don't need the e() around everything. That's something I was meaning to go back in and fix at some point.
We should also probably switch to the request() or $request->input() methods instead of the older Input::() facade.
snipe
reviewed
Jan 17, 2018
resources/views/setup/user.blade.php
Outdated
|
|
||
| <!-- Language --> | ||
| <div class="form-group col-lg-6 {{$errors->has('default_language') ? 'error' : ''}}"> | ||
| {{ Form::label('site_name', trans('admin/settings/general.default_language')) }} |
There was a problem hiding this comment.
Also, I think the label name is wrong here?
{{ Form::label('site_name', trans('admin/settings/general.default_language')) }}
should be
{{ Form::label('locale', trans('admin/settings/general.default_language')) }}
Added default value for language to 'en' and multiple companies support to 0 (false) Switched out the old Input facade to the preferred $request->input method for the setup page.
|
Nice work, thanks!
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For feature request #4812.
I can work on moving the settings into separate steps for readability in another pull.