Fix latest merge

This commit is contained in:
Nicolas Le Goff
2014-08-11 22:53:13 +02:00
parent 2899f152fb
commit 4fa1f613e4
35 changed files with 378 additions and 275 deletions

View File

@@ -43,7 +43,7 @@
{% set desc = publishing.basket().getDescription() %}
{% endif %}
<br />
{% if app["phraseanet.registry"].get("GV_enable_feed_notification") %}
{% if app['conf'].get(['registry', 'actions', 'enable-feed-notification']) %}
<label class="checkbox">
<input class="required_text checkbox" type="checkbox" name="notify" id="feed_add_notify" value="1" style="min-height: 0; height: auto" />
<i class="icon icon-envelope"></i>&nbsp;{{ 'Notify users about this publication' | trans }}