[Mpuls-commits] r2359 - in wasko/branches/2.0: . mpulsweb/model

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-04-15 10:02:32 +0200 (Thu, 15 Apr 2010)
New Revision: 2359

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/model/user.py
Log:
Fixed issue #1352: display correct Super-Admin role

Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-15 07:31:22 UTC (rev 2358)
+++ wasko/branches/2.0/ChangeLog	2010-04-15 08:02:32 UTC (rev 2359)
@@ -1,3 +1,9 @@
+2010-04-15  Roland Geider <roland.geider at intevation.de>
+
+	* mpulsweb/templates/main.mako:
+	* mpulsweb/model/user.py: Fixed Wald issue #1352: Added tooltip to username
+        and changed displayed role of "adm" user
+
 2010-04-15  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* jmdweb/public/formed/formedtree.xml: New formedtree

Modified: wasko/branches/2.0/mpulsweb/model/user.py
===================================================================
--- wasko/branches/2.0/mpulsweb/model/user.py	2010-04-15 07:31:22 UTC (rev 2358)
+++ wasko/branches/2.0/mpulsweb/model/user.py	2010-04-15 08:02:32 UTC (rev 2359)
@@ -323,11 +323,12 @@
             return None
 
     def getRole(self):
-        """Return the user's role as a string to display in the ui
+        """Return the user's role as a string to display in the UI
            Translate Roles:
              * admin -> Admin
              * cm    -> CM
-             * pt   -> PT
+             * pt    -> PT
+             * ka    -> Sonder-Admin
         """
         permrole = self.getPermissionRole()
         if permrole == 'cm':
@@ -336,6 +337,8 @@
             return 'Admin'
         elif permrole == 'pt':
             return 'PT'
+        elif permrole == 'ka':
+            return 'Sonder-Admin'
         else:
             return permrole