Changeset fa6e07 in indico

Timestamp:

08/23/11 15:38:47 (21 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

28c4bd

Parents:

2423e3

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (05/06/11 12:22:52)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (08/23/11 15:38:47)

Message:

Add userid arg to api key management

Location:

indico/MaKaC/webinterface

Files:

• pages/admins.py (modified) (1 diff)
• pages/api.py (modified) (1 diff)
• rh/api.py (modified) (1 diff)
• tpls/UserAPI.tpl (modified) (1 diff)

indico/MaKaC/webinterface/pages/admins.py

@@ -1538 +1538 @@
 
         self._tabAPI = self._tabCtrl.newTab( "api", _("HTTP API"), \
-                urlHandlers.UHUserAPI.getURL() )
+                urlHandlers.UHUserAPI.getURL(self._avatar) )
 
     def _getNavigationDrawer(self):

indico/MaKaC/webinterface/pages/api.py

@@ -37 +37 @@
     def getVars(self):
         vars = WTemplated.getVars(self)
+        vars['avatar'] = self._avatar
         vars['apiKey'] = self._avatar.getAPIKey()
         return vars

indico/MaKaC/webinterface/rh/api.py

@@ -20 +20 @@
 
 from indico.web.http_api.auth import APIKey
-from MaKaC.webinterface.rh.base import RHProtected
+from MaKaC.webinterface.rh.users import RHUserBase
 from MaKaC.webinterface import urlHandlers
 from MaKaC.webinterface.pages.api import WPUserAPI
 from MaKaC.errors import AccessError
 
-class RHUserAPI(RHProtected):
-    _uh = urlHandlers.UHUserAPI
-
+class RHUserAPI(RHUserBase):
     def _process(self):
-        p = WPUserAPI(self, self._getUser())
+        p = WPUserAPI(self, self._avatar)
         return p.display()
 
-class RHUserAPICreate(RHProtected):
-    _uh = urlHandlers.UHUserAPI
-
+class RHUserAPICreate(RHUserBase):
     def _checkProtection(self):
-        RHProtected._checkProtection(self)
-        ak = self._getUser().getAPIKey()
+        RHUserBase._checkProtection(self)
+        ak = self._avatar.getAPIKey()
         if ak and ak.isBlocked():
             raise AccessError()
 
     def _process(self):
-        ak = self._getUser().getAPIKey()
+        ak = self._avatar.getAPIKey()
         if not ak:
-            ak = APIKey(self._getUser())
+            ak = APIKey(self._avatar)
             ak.create()
         else:
             ak.newKey()
-        self._redirect(self._uh.getURL())
+        self._redirect(urlHandlers.UHUserAPI.getURL(self._avatar))

indico/MaKaC/webinterface/tpls/UserAPI.tpl

@@ -49 +49 @@
             <td>
                 % if not apiKey:
-                    <form action="${urlHandlers.UHUserAPICreate.getURL()}" method="POST" onsubmit="return confirm('${_("Please only create an API key if you actually need one. Unused API keys might be deleted after some time.")}');">
+                    <form action="${urlHandlers.UHUserAPICreate.getURL(avatar)}" method="POST" onsubmit="return confirm('${_("Please only create an API key if you actually need one. Unused API keys might be deleted after some time.")}');">
                         <input type="submit" value="Create API key" />
                     </form>
                 % else:
-                    <form action="${urlHandlers.UHUserAPICreate.getURL()}" method="POST" onsubmit="return confirm('${_("Warning: When creating a new API key, your old key will stop working immediately!")}');">
+                    <form action="${urlHandlers.UHUserAPICreate.getURL(avatar)}" method="POST" onsubmit="return confirm('${_("Warning: When creating a new API key, your old key will stop working immediately!")}');">
                         <input type="submit" value="Create a new API key" />
                     </form>