From af81e9d84b66245a4b05ff46438eef97c3e23862 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Thu, 6 Mar 2014 17:16:18 +0100
Subject: [PATCH] Fix method calls in templates

---
 templates/web/account/authorized_apps.html.twig | 10 ++++++----
 templates/web/developers/application.html.twig  | 10 +++++-----
 templates/web/developers/applications.html.twig | 12 ++++++------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/templates/web/account/authorized_apps.html.twig b/templates/web/account/authorized_apps.html.twig
index f8c03ef778..df9f5a7ac0 100644
--- a/templates/web/account/authorized_apps.html.twig
+++ b/templates/web/account/authorized_apps.html.twig
@@ -13,12 +13,14 @@
                 <h3>{{ "Vous avez autorise ces applications a acceder a votre compte" | trans }}</h3>
                 {% if applications|length > 0 %}
                     <ul class="unstyled app-list">
-                        {% for application in applications %}
+                        {% for data in applications if data["user-account"] is not none %}
+                            {% set application = data["application"] %}
+                            {% set account = data["user-account"] %}
                             <li id="app_{{ application.getId() }}">
                                 <div>
-                                    {% set account = application.getAccount() %}
-                                    <a href="{{ path("grant_app_access", {"application_id" : application.getId()}) }}" class="revoke app-btn btn btn-small pull-right {% if account.is_revoked() %}hidden{% endif %}" value="{{application.getId()}}">{{ "Revoquer l\'access" | trans }}</a>
-                                    <a href="{{ path("grant_app_access", {"application_id" : application.getId()}) }}"  class="authorize app-btn btn btn-small pull-right {% if not account.is_revoked() %}hidden{% endif %}" value="{{application.getId()}}">{{ "Authoriser l\'access" | trans }}</a>
+
+                                    <a href="{{ path("grant_app_access", {"application" : application.getId()}) }}" class="revoke app-btn btn btn-small pull-right {% if account.isRevoked() %}hidden{% endif %}" value="{{application.getId()}}">{{ "Revoquer l\'access" | trans }}</a>
+                                    <a href="{{ path("grant_app_access", {"application" : application.getId()}) }}"  class="authorize app-btn btn btn-small pull-right {% if not account.isRevoked() %}hidden{% endif %}" value="{{application.getId()}}">{{ "Authoriser l\'access" | trans }}</a>
                                     <p class="app-row">
                                         <a href="{{ application.getWebsite() }}" target="_blank">
                                             <strong>{{ application.getName() }}</strong>
diff --git a/templates/web/developers/application.html.twig b/templates/web/developers/application.html.twig
index f602b9ef7e..8be5de858f 100644
--- a/templates/web/developers/application.html.twig
+++ b/templates/web/developers/application.html.twig
@@ -13,7 +13,7 @@
             <input type="hidden" value="{{ application.getId() }}" name="app_id"/>
 
             <div>
-              <div><strong><a class="link" href="{{ path("developers_application", {"id" : application.getId()}) }}">{{ application.getName() }}</a></strong></div>
+              <div><strong><a class="link" href="{{ path("developers_application", {"application" : application.getId()}) }}">{{ application.getName() }}</a></strong></div>
               <div>{{ application.getDescription() }}</div>
             </div>
 
@@ -32,14 +32,14 @@
                     </tr>
                     <tr>
                         <td>{{ "URL de callback" | trans }}</td>
-                            {% if application.getType() == constant("Alchemy\Phrasea\Model\Entities\ApiApplication::DESKTOP_TYPE") %}
+                            {% if application.getType() == constant("DESKTOP_TYPE", application) %}
                             <td>
                                 <span>{{ application.getRedirectUri() }}</span>
                             </td>
                         {% else %}
                             <td class="url_callback">
                                 <span class="url_callback_input">{{ application.getRedirectUri() }}</span>
-                                <a href="{{ path("submit_application_callback", {"id" : application.getId()}) }}" class="save_callback btn btn-small btn-info" style="display:none;">
+                                <a href="{{ path("submit_application_callback", {"application" : application.getId()}) }}" class="save_callback btn btn-small btn-info" style="display:none;">
                                     {{ "Save" | trans }}
                                 </a>
                                 <button type="button" class="modifier_callback btn btn-small">
@@ -63,7 +63,7 @@
                                 type="checkbox"
                                 {{ application.isPasswordGranted() ? "checked='checked'" : "" }}
                                 name="grant"
-                                value="{{ path("submit_developers_application_authorize_grant_password", {"id" : application.getId()}) }}"
+                                value="{{ path("submit_developers_application_authorize_grant_password", {"application" : application.getId()}) }}"
                             >
                         </td>
                     </tr>
@@ -87,7 +87,7 @@
                                   {{ "Le token n\'a pas encore ete genere" | trans }}
                                 {% endif %}
                             </span>
-                            <a id="generate_access" href="{{ path("submit_developers_application_token",{ "id" : application.getId()}) }}" class="btn btn-small btn-info">{{ "boutton::generer" | trans }}</a>
+                            <a id="generate_access" href="{{ path("submit_developers_application_token",{ "application" : application.getId()}) }}" class="btn btn-small btn-info">{{ "boutton::generer" | trans }}</a>
                           </td>
                     </tr>
                 </tbody>
diff --git a/templates/web/developers/applications.html.twig b/templates/web/developers/applications.html.twig
index d8bf0d58fc..1152c1589d 100644
--- a/templates/web/developers/applications.html.twig
+++ b/templates/web/developers/applications.html.twig
@@ -15,7 +15,7 @@
                 {% if applications|length > 0 %}
                     <ul class="app-list unstyled">
                         {% for application in applications %}
-                              <li id="app_{{ application.get_id() }}">
+                              <li id="app_{{ application.getId() }}">
                                     <a href="#appModal-{{ loop.index }}" role="button" data-toggle="modal" class="pull-right btn btn-danger btn-small" type="button">
                                         {{ "button::supprimer" | trans }}
                                     </a>
@@ -23,24 +23,24 @@
                                     <div id="appModal-{{ loop.index }}" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
                                         <div class="modal-header">
                                             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                                            <h3 id="myModalLabel">{{ application.get_name() }}</h3>
+                                            <h3 id="myModalLabel">{{ application.getName() }}</h3>
                                         </div>
                                         <div class="modal-body">
                                             <p>{{ "Are you sure you want to delete this application?" | trans }} </p>
                                         </div>
                                         <div class="modal-footer">
                                             <button class="btn" data-dismiss="modal" aria-hidden="true">{{ "No" | trans }}</button>
-                                            <a href="{{ path("delete_developers_application", {"id" : application.get_id()}) }}" class="delete-app btn btn-info">{{ "Yes" | trans }}</a>
+                                            <a href="{{ path("delete_developers_application", {"application" : application.getId()}) }}" class="delete-app btn btn-info">{{ "Yes" | trans }}</a>
                                         </div>
                                     </div>
                                     <p class="app-row">
                                       <strong>
-                                        <a  class="link" href="{{ path("developers_application", {"id" : application.get_id}) }}">
-                                            {{ application.get_name() }}
+                                        <a  class="link" href="{{ path("developers_application", {"application" : application.getId}) }}">
+                                            {{ application.getName() }}
                                         </a>
                                       </strong>
                                     </p>
-                                    <p class="app-row">{{ application.get_description()|truncate(120, true, "...") }}</p>
+                                    <p class="app-row">{{ application.getDescription()|truncate(120, true, "...") }}</p>
                               </li>
                         {%endfor%}
                     </ul>