Skip to content

Commit

Permalink
Merge branch 'hotfix/v1.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
ambroisemaupate committed Dec 21, 2018
2 parents 3b47438 + e289d80 commit a0a7dac
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 10 deletions.
8 changes: 4 additions & 4 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,16 @@

# General information about the project.
project = u'Roadiz documentation'
copyright = u'2018, Ambroise Maupate & Julien Blanchet'
copyright = u'2019, Ambroise Maupate & Julien Blanchet'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '1.0.3'
version = '1.0.4'
# The full version, including alpha/beta/rc tags.
release = '1.0.3'
release = '1.0.4'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -341,7 +341,7 @@
epub_title = u'Roadiz'
epub_author = u'Ambroise Maupate, Maxime Constantinian, Julien Blanchet, Thomas Aufresne, Adrien Scholaert, Élodie Arnouk'
epub_publisher = u'REZO ZERO'
epub_copyright = u'2018, Ambroise Maupate & Julien Blanchet'
epub_copyright = u'2019, Ambroise Maupate & Julien Blanchet'

# The basename for the epub file. It defaults to the project name.
#epub_basename = u'Roadiz'
Expand Down
2 changes: 1 addition & 1 deletion developer/first-steps/manual_config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ http://doctrine-dbal.readthedocs.org/en/latest/reference/configuration.html
Themes
------

Since *Roadiz v0.23*, themes are statically registered into Roadiz configuration for better performances
Since *Roadiz v1.0*, themes are statically registered into Roadiz configuration for better performances
and delaying database usage. You have to register any front-end theme in your ``app/conf/config.yml`` file.
Theme priority is not handled here but in each of your themes by overriding static ``$priority`` value;

Expand Down
32 changes: 27 additions & 5 deletions developer/themes/theme_firewall.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@ to be sure that ``^/`` request matcher has **the lowest priority**. However, if
public static function addDefaultFirewallEntry(Container $container)
{
/*
* Call parent ONLY if you don’t want to create
* a firewall map at website root level.
* Your custom firewall map entry configuration
* goes here
*/
parent::addDefaultFirewallEntry($container);
/*
* Your custom firewall map entry configuration
* goes here
* Call parent ONLY if you don’t want to create
* a firewall map at website root level. And call it after
* your own firewall entry.
*/
parent::addDefaultFirewallEntry($container);
}
Configuring a non-root firewall map entry with FirewallEntry class
Expand Down Expand Up @@ -255,3 +256,24 @@ and defined login/logout paths.
For the moment, every pages of your website will be public. You’ll need to use
``is_granted`` *Twig* filter and ``$this->denyAccessUnlessGranted($role)`` method to
manage access control to your contents.

Multi-theme website
^^^^^^^^^^^^^^^^^^^

If your website has more than one theme you must disable firewall entries on every non-main
theme app class not to register duplicated firewall entries with the same access-map rules.

For example, if you registered a ``MainTheme`` and a ``SecondaryTheme``, add the following
lines to your ``themes/SecondaryTheme/SecondaryThemeApp.php`` class:

.. code-block:: php
/**
* {@inheritdoc}
*/
public static function addDefaultFirewallEntry(Container $container)
{
/*
* Do not register any firewall entry
*/
}

0 comments on commit a0a7dac

Please sign in to comment.