Changeset 2677 for package_branches

Timestamp:

Dec 20, 2009, 9:44:45 PM (15 years ago)

Author:

broder

Message:

Get username from cherrypy request object

Location:

package_branches/invirt-web/cherrypy-rebased/code

Files:

• main.py (modified) (1 diff)
• templates/skeleton.mako (modified) (1 diff)

package_branches/invirt-web/cherrypy-rebased/code/main.py

@@ -140 +140 @@
             subject = [subject]
 
-        return dict(user=cherrypy.request.login,
-                    simple=simple,
+        return dict(simple=simple,
                     subjects=subject,
                     mapping=help_mapping)

package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako

@@ -47 +47 @@
 
 % if not simple:
-% if user:
-<p class="loggedin">Welcome, <span class="name">${user}</span>.</p>
+% if cherrypy.request.login:
+<p class="loggedin">Welcome, <span class="name">${cherrypy.request.login}</span>.</p>
 % endif