From 697b234d5473c8bab97ebb0c66579c803f36a003 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Fri, 28 Sep 2012 12:45:58 +0200
Subject: [PATCH] Fix templates

---
 templates/web/account/authorized_apps.html.twig           | 2 +-
 templates/web/admin/publications/fiche.html.twig          | 2 +-
 templates/web/admin/publications/list.html.twig           | 2 +-
 templates/web/common/caption.html.twig                    | 2 +-
 templates/web/login/head.html.twig                        | 4 ++--
 templates/web/prod/WorkZone/Browser/Basket.html.twig      | 2 +-
 templates/web/prod/WorkZone/Browser/Results.html.twig     | 2 +-
 templates/web/prod/actions/Bridge/disconnected.html.twig  | 2 +-
 templates/web/prod/actions/Bridge/index.html.twig         | 2 +-
 templates/web/prod/actions/publish/publish.html.twig      | 2 +-
 templates/web/prod/actions/publish/publish_edit.html.twig | 2 +-
 templates/web/prod/index.html.twig                        | 4 ++--
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/web/account/authorized_apps.html.twig b/templates/web/account/authorized_apps.html.twig
index 9bc9ad63b7..725d68c81d 100644
--- a/templates/web/account/authorized_apps.html.twig
+++ b/templates/web/account/authorized_apps.html.twig
@@ -58,7 +58,7 @@ $(document).ready(function(){
               {% for application in applications %}
                 <li id='app_{{application.get_id}}'>
                   <div>
-                    {% set account = application.get_user_account(user) %}
+                    {% set account = application.get_user_account(app['phraseanet.user']) %}
                       {% if account.is_revoked() is empty %}
                         <button type='button' class='revoke app-btn' value='{{application.get_id()}}'>{% trans 'Revoquer l\'access' %}</button>
                       {% else %}
diff --git a/templates/web/admin/publications/fiche.html.twig b/templates/web/admin/publications/fiche.html.twig
index f52c69ef53..0867a04e52 100644
--- a/templates/web/admin/publications/fiche.html.twig
+++ b/templates/web/admin/publications/fiche.html.twig
@@ -6,7 +6,7 @@
     {% if error %}
         <div class="error alert alert-error">{{ error }}</div>
     {% endif %}
-    {% if feed.is_owner(user) %}
+    {% if feed.is_owner(app['phraseanet.user']) %}
         <h2>{% trans 'Edition' %}</h2>
         <div class="control-group">
             <div id="pub_icon">
diff --git a/templates/web/admin/publications/list.html.twig b/templates/web/admin/publications/list.html.twig
index 4f839bdb0f..bbf8eff188 100644
--- a/templates/web/admin/publications/list.html.twig
+++ b/templates/web/admin/publications/list.html.twig
@@ -81,7 +81,7 @@
                     {% endif %}
                 </td>
                 <td valign="center" align="center">
-                    {% if feed.is_owner(user) %}
+                    {% if feed.is_owner(app['phraseanet.user']) %}
                         <form class="no-ajax form_publication" action="/admin/publications/feed/{{feed.get_id()}}/delete/" method="post" style="margin:0;">
                             <button class="feed_remover btn btn-mini">{% trans 'boutton::supprimer' %}</button>
                         </form>
diff --git a/templates/web/common/caption.html.twig b/templates/web/common/caption.html.twig
index fd39e04625..b33c42a892 100644
--- a/templates/web/common/caption.html.twig
+++ b/templates/web/common/caption.html.twig
@@ -5,7 +5,7 @@
 {% import 'common/caption_templates/overview.html.twig' as cap_ovr %}
 {% import 'common/caption_templates/preview.html.twig' as cap_prev %}
 
-{% if user %}
+{% if app['phraseanet.user'] %}
   {% set business = app['phraseanet.user'].ACL().has_right_on_base(record.get_base_id(), 'canmodifrecord') %}
 {% else %}
   {% set business = false %}
diff --git a/templates/web/login/head.html.twig b/templates/web/login/head.html.twig
index 993203e140..9d7f058fa9 100644
--- a/templates/web/login/head.html.twig
+++ b/templates/web/login/head.html.twig
@@ -5,9 +5,9 @@
 <meta content="phraseanet" name="generator"/>
 
 {% for feed in feeds %}
-    {% set link = feed.get_homepage_link(registry, 'rss') %}
+    {% set link = feed.get_homepage_link(app['phraseanet.registry'], 'rss') %}
     <link rel="alternate" type="{{ link.get_mimetype() }}" title="{{ link.get_title() }}" href="{{ link.get_href() }}" />
-    {% set link = feed.get_homepage_link(registry, 'atom') %}
+    {% set link = feed.get_homepage_link(app['phraseanet.registry'], 'atom') %}
     <link rel="alternate" type="{{ link.get_mimetype() }}" title="{{ link.get_title() }}" href="{{ link.get_href() }}" />
 {% endfor %}
 
diff --git a/templates/web/prod/WorkZone/Browser/Basket.html.twig b/templates/web/prod/WorkZone/Browser/Basket.html.twig
index f0e46a2564..fbdb499166 100644
--- a/templates/web/prod/WorkZone/Browser/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Basket.html.twig
@@ -11,7 +11,7 @@
         <td>
           <h1 class="title">
             <img class="loader" src="/skins/prod/Basket/Browser/loader.gif" />
-            {% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(user) %}
+            {% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(app['phraseanet.user']) %}
             <a href="/prod/baskets/{{ Basket.getId() }}/archive/?archive=1" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};">
               <span>
                 <img src="/skins/prod/Basket/Browser/archive.png"/>
diff --git a/templates/web/prod/WorkZone/Browser/Results.html.twig b/templates/web/prod/WorkZone/Browser/Results.html.twig
index aad5322315..1d029b0d7f 100644
--- a/templates/web/prod/WorkZone/Browser/Results.html.twig
+++ b/templates/web/prod/WorkZone/Browser/Results.html.twig
@@ -49,7 +49,7 @@
             <td class="content">
               <h1 class="title">
                 <img class="loader" src="/skins/prod/Basket/Browser/loader.gif" />
-                {% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(user) %}
+                {% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(app['phraseanet.user']) %}
                 <a href="/prod/baskets/{{ Basket.getId() }}/archive/?archive=1" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};">
                   <span>
                     <img src="/skins/prod/Basket/Browser/archive.png"/>
diff --git a/templates/web/prod/actions/Bridge/disconnected.html.twig b/templates/web/prod/actions/Bridge/disconnected.html.twig
index 937e3784be..a7ab8f3b07 100644
--- a/templates/web/prod/actions/Bridge/disconnected.html.twig
+++ b/templates/web/prod/actions/Bridge/disconnected.html.twig
@@ -11,7 +11,7 @@
                             <button class="login_button new_bridge_button btn btn-inverse">
                                 {% trans 'login:: connexion' %}
                             </button>
-                            <input type="hidden" name="url" value="{{account.get_api().generate_login_url(registry, account.get_api().get_connector().get_name()) }}" />
+                            <input type="hidden" name="url" value="{{account.get_api().generate_login_url(app['phraseanet.registry'], account.get_api().get_connector().get_name()) }}" />
                         </form>
                     </td>
                     <td>
diff --git a/templates/web/prod/actions/Bridge/index.html.twig b/templates/web/prod/actions/Bridge/index.html.twig
index f76d280fbe..fee7f2337b 100644
--- a/templates/web/prod/actions/Bridge/index.html.twig
+++ b/templates/web/prod/actions/Bridge/index.html.twig
@@ -64,7 +64,7 @@
                                                     </tr>
                                                 </table>
                                             </button>
-                                            <input type="hidden" name="url" value="{{api.generate_login_url(registry, api.get_connector().get_name()) }}" />
+                                            <input type="hidden" name="url" value="{{api.generate_login_url(app['phraseanet.registry'], api.get_connector().get_name()) }}" />
                                         </form>
                                     {% endif %}
                                 {% endfor %}
diff --git a/templates/web/prod/actions/publish/publish.html.twig b/templates/web/prod/actions/publish/publish.html.twig
index 93f3b49477..8ed48ea86c 100644
--- a/templates/web/prod/actions/publish/publish.html.twig
+++ b/templates/web/prod/actions/publish/publish.html.twig
@@ -54,7 +54,7 @@
                 <h1>{% trans 'Fils disponibles' %}</h1>
                 <div class="list">
                     {% for feed in feeds.get_feeds() %}
-                        {% if feed.is_publisher(user) %}
+                        {% if feed.is_publisher(app['phraseanet.user']) %}
                             <div class="feed {% if loop.index is odd%}odd{% endif %}">
                                 <span>{{ feed.get_title() }}</span>
                                 {% if feed.is_public() %}
diff --git a/templates/web/prod/actions/publish/publish_edit.html.twig b/templates/web/prod/actions/publish/publish_edit.html.twig
index 72e9447aa2..af8a2c2793 100644
--- a/templates/web/prod/actions/publish/publish_edit.html.twig
+++ b/templates/web/prod/actions/publish/publish_edit.html.twig
@@ -47,7 +47,7 @@
         <div class="list">
           {% set feed_id = entry.get_feed().get_id() %}
           {% for feed in feeds.get_feeds() %}
-             {% if feed.is_publisher(user) %}
+             {% if feed.is_publisher(app['phraseanet.user']) %}
                 <div class="feed {% if loop.index is odd%}odd{% endif %} {% if feed_id == feed.get_id() %}selected{% endif %}">
                     <span>{{ feed.get_title() }}</span>
                     <input type="hidden" value="{{ feed.get_id() }}"/>
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 98dcbe5119..f0e3d960e0 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -46,9 +46,9 @@
 
 {% block rss %}
     {% for feed in feeds %}
-        {% set link = feed.get_user_link(registry, app['phraseanet.user'], 'rss') %}
+        {% set link = feed.get_user_link(app['phraseanet.registry'], app['phraseanet.user'], 'rss') %}
         <link rel="alternate" type="{{ link.get_mimetype() }}" title="{{ link.get_title() }}" href="{{ link.get_href() }}" />
-        {% set link = feed.get_user_link(registry, app['phraseanet.user'], 'atom') %}
+        {% set link = feed.get_user_link(app['phraseanet.registry'], app['phraseanet.user'], 'atom') %}
         <link rel="alternate" type="{{ link.get_mimetype() }}" title="{{ link.get_title() }}" href="{{ link.get_href() }}" />
     {% endfor %}
 {% endblock %}