Skip to content
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

Settings page #1612

Merged
merged 13 commits into from
Feb 4, 2016
Merged

Settings page #1612

merged 13 commits into from
Feb 4, 2016

Conversation

j0k3r
Copy link
Member

@j0k3r j0k3r commented Jan 21, 2016

Fix #1575

This PR add an internal config page where admin can configure its wallabag instance. Most of the parameters from the parameters.yml.dist were moved to this page as they can be switched during run time.

To achieve that I've used the CraueConfigBundle. Each parameter has a section which allow to have a less disgusting internal config page.
This page is only accessible by user with role ROLE_SUPER_ADMIN.

This table is filled using the InstallCommand (at the same time we build the user config).

Things to check before validate this PR:

  • Translation for each parameters
  • Section for each parameters

Preview:

image

Bonus

I've added a message on the Pocket import page when the consumer key isn't defined:

Pocket import isn't configured. You need to define pocket_consumer_key.

@j0k3r j0k3r added this to the 2.0.0-beta.1 milestone Jan 21, 2016
@@ -58,3 +58,4 @@ security:
- { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/, roles: ROLE_USER }
- { path: ^/settings, roles: ROLE_SUPER_ADMIN }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With my ROLE_USER user, I can access to this URL.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah I haven't tested that case. It's done.

@@ -41,25 +47,6 @@ wallabag_import:
twig:
debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"
globals:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice removal :-)

@nicosomb
Copy link
Member

Still conflicts due to the last merged PR.

@tcitworld
Copy link
Member

Don't forget to update parameters according to #1629. :)

@j0k3r
Copy link
Member Author

j0k3r commented Jan 31, 2016

@tcitworld updated.

@tcitworld
Copy link
Member

You deleted the app.version parameter but it isn't put elsewhere. Is this intended ?

@j0k3r
Copy link
Member Author

j0k3r commented Jan 31, 2016

@tcitworld It's sent to the template here and I don't have to update the template because the version var has the same name (see for material & baggy).

export_txt: Activer l'export TXT
export_xml: Activer l'export XML
pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication)
shaarli_url: URL de Shaarli, si le service Diaspora est activé
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

si le service Diaspora est activé > si le service est activé

nicosomb added a commit that referenced this pull request Feb 4, 2016
@nicosomb nicosomb merged commit e008c03 into v2 Feb 4, 2016
@nicosomb nicosomb deleted the v2-settings-page branch February 4, 2016 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants