Changeset 26ef4e in indico

Timestamp:

03/23/11 18:28:19 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

v0.97-series

Children:

652198

Parents:

cf32f5

Message:

[FIX] Remove account management buttons

• When there are no local accounts;

Location:

indico/MaKaC/webinterface

Files:

• pages/admins.py (modified) (1 diff)
• tpls/UserIdentitiesTable.tpl (modified) (1 diff)

indico/MaKaC/webinterface/pages/admins.py

@@ -1401 +1401 @@
         am = AuthenticatorMgr()
         authTagList = [i.getId() for i in am.getList()]
-        for item in self._avatar.getIdentityList():
-            if not item.getAuthenticatorTag() in authTagList:
-                continue
-            changePassword = ""
-            if item.getAuthenticatorTag() != "Local" :
-                changePassword = _("External account")
-            else :
-                changeURL = urlHandlers.UHUserIdentityChangePassword.getURL()
-                changeURL.addParam("userId",self._avatar.getId())
-                changeURL.addParam("identityId",item.getId())
-                changePassword = _("""<a href="%s"><small> _("Change password")</small></a>""")%changeURL
-            il.append("""
-                        <tr>
-                            <td width="60%%">
-                                <input type="checkbox" name="selIdentities" value="%s"> %s
-                            </td>
-                            <td width="20%%">
-                                <small>%s</small>
-                            </td>
-                            <td width="20%%">
-                                %s
-                            </td>
-                        </tr>
-                        """%(item.getId(), item.getLogin(), item.getAuthenticatorTag(), changePassword) )
-        vars["items"] = "".join( il )
+
+        vars["identityItems"] = filter(lambda x: not x.getAuthenticatorTag() in authTagList, self._avatar.getIdentityList())
+        vars["avatar"] = self._avatar
         vars["locator"] = self._avatar.getLocator().getWebForm()
+        vars["accountManagementActive"] = 'Local' in authTagList
         return vars
 

indico/MaKaC/webinterface/tpls/UserIdentitiesTable.tpl

@@ -1 +1 @@
 
-<form action="%(removeIdentityURL)s" method="POST" style="margin: 0;">
+<form action="<%= removeIdentityURL %>" method="POST" style="margin: 0;">
 <table>
-    %(items)s
+<% for item in identityItems: %>
+<tr>
+  <td width="60%%">
+    <% if accountManagementActive: %>
+    <input type="checkbox" name="selIdentities" value="<%= item.getId() %>" />
+    <% end %>
+    <%= item.getLogin() %>
+  </td>
+  <td width="20%%">
+    <%= item.getAuthenticatorTag() %>
+  </td>
+  <td>
+    <% if item.getAuthenticatorTag() == "Local": %>
+    <a href="<%= urlHandlers.UHUserIdentityChangePassword.getURL(userId=avatar.getId(), identityId=item.getId()) %>">
+      <small> <%= _("Change password") %></small>
+    </a>
+    <% end %>
+    <% else: %>
+    External account
+    <% end %>
+  </td>
+</td>
+</tr>
+<% end %>
     <tr>
         <td>
         <table>
             <tr>
+                <% if accountManagementActive: %>
                 <td>
                     <input type="submit" class="btn" value="<%= _("delete selected accounts")%>" name="action">
                     </form>
                 </td>
-
                 <td>
-                <form style="margin: 0; padding: 0;" action="%(addIdentityURL)s" method="POST">
+                <form style="margin: 0; padding: 0;" action="<%= addIdentityURL %>" method="POST">
                     <input type="submit" class="btn" value="<%= _("create a new account")%>" name="action">
                 </form>
-
                 </td>
+                <% end %>
             </tr>
         </table>