New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show the CORS settings in the UI when enable_general_settings_admin=0 #13660

Merged
merged 3 commits into from Nov 4, 2018

Conversation

Projects
None yet
3 participants
@mattab
Member

mattab commented Nov 1, 2018

The INI setting description does not mean to include CORS:

; By setting this option to 0, the following settings will be hidden and disabled from being set in the UI:
; - "Archiving Settings"
; - "Update settings"
; - "Email server settings"
enable_general_settings_admin = 1
Show the CORS settings in the UI when enable_general_settings_admin=0
The INI setting description does not mean to include CORS:
```ini

; By setting this option to 0, the following settings will be hidden and disabled from being set in the UI:
; - "Archiving Settings"
; - "Update settings"
; - "Email server settings"
enable_general_settings_admin = 1
```

@mattab mattab added this to the 3.7.0 milestone Nov 1, 2018

@sgiehl

sgiehl approved these changes Nov 1, 2018

Code looks fine. Just to be sure, this will also activate the possibility to change the trusted hostnames

@tsteur

trusted hostnames should not be writable in this case

@mattab

This comment has been minimized.

Member

mattab commented Nov 1, 2018

@sgiehl would it be possible for you to update the PR so that trusted hosts stay hidden, but CORS are visible in their own section in the General settings?

mattab and others added some commits Nov 1, 2018

@sgiehl

This comment has been minimized.

Member

sgiehl commented Nov 2, 2018

@mattab done.

@tsteur tsteur merged commit b39563c into 3.x-dev Nov 4, 2018

0 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/travis-ci/push The Travis CI build failed
Details

@tsteur tsteur deleted the cors branch Nov 4, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment