diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-05-12 16:33:12 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-05-12 16:39:47 +0200 |
commit | 3b792787d741932acc4d1e35124d38886bad11d7 (patch) | |
tree | c794606b49761ec35891ef4b3258a07dcc42f4f2 /app | |
parent | 06568b15bb9e9116fa4d4a42246e1b0e497bbf25 (diff) | |
download | wallabag-3b792787d741932acc4d1e35124d38886bad11d7.tar.gz wallabag-3b792787d741932acc4d1e35124d38886bad11d7.tar.zst wallabag-3b792787d741932acc4d1e35124d38886bad11d7.zip |
Upgraded CraueConfigBundle to 2.0
Diffstat (limited to 'app')
-rw-r--r-- | app/Resources/CraueConfigBundle/views/Settings/modify.html.twig | 10 | ||||
-rw-r--r-- | app/config/config.yml | 1 | ||||
-rw-r--r-- | app/config/services.yml | 8 |
3 files changed, 13 insertions, 6 deletions
diff --git a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig index c4e735ee..b81b8651 100644 --- a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig +++ b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig | |||
@@ -20,12 +20,10 @@ | |||
20 | 20 | ||
21 | {% for section in sections | craue_sortSections %} | 21 | {% for section in sections | craue_sortSections %} |
22 | <div id="set-{{ section }}" class="col s12"> | 22 | <div id="set-{{ section }}" class="col s12"> |
23 | {% for setting in form.settings if setting.section.vars.value == section %} | 23 | {% for setting in form.settings if setting.vars.value.section == section %} |
24 | {{ form_row(setting.name) }} | 24 | {{ form_row(setting.value, { |
25 | {{ form_row(setting.section) }} | 25 | 'label': setting.vars.value.name | trans({}, 'CraueConfigBundle'), |
26 | {{ form_row(setting.value, { | 26 | }) }} |
27 | 'label': setting.name.vars.value | trans({}, 'CraueConfigBundle'), | ||
28 | }) }} | ||
29 | {% endfor %} | 27 | {% endfor %} |
30 | </div> | 28 | </div> |
31 | {% endfor %} | 29 | {% endfor %} |
diff --git a/app/config/config.yml b/app/config/config.yml index 116bb04c..28abe734 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -6,6 +6,7 @@ imports: | |||
6 | parameters: | 6 | parameters: |
7 | # Allows to use the live reload feature for changes in assets | 7 | # Allows to use the live reload feature for changes in assets |
8 | use_webpack_dev_server: false | 8 | use_webpack_dev_server: false |
9 | craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter | ||
9 | 10 | ||
10 | framework: | 11 | framework: |
11 | #esi: ~ | 12 | #esi: ~ |
diff --git a/app/config/services.yml b/app/config/services.yml index 9a1ce80b..7b85d846 100644 --- a/app/config/services.yml +++ b/app/config/services.yml | |||
@@ -42,3 +42,11 @@ services: | |||
42 | arguments: ["@session"] | 42 | arguments: ["@session"] |
43 | tags: | 43 | tags: |
44 | - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } | 44 | - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } |
45 | |||
46 | craue_config_cache_provider: | ||
47 | class: Symfony\Component\Cache\Adapter\FilesystemAdapter | ||
48 | public: false | ||
49 | arguments: | ||
50 | - 'craue_config' | ||
51 | - 0 | ||
52 | - '%kernel.cache_dir%' | ||