[rhmessaging-commits] rhmessaging commits: r3693 - in mgmt/trunk/cumin/python/cumin: grid and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2009-11-04 10:18:23 -0500 (Wed, 04 Nov 2009)
New Revision: 3693

Modified:
   mgmt/trunk/cumin/python/cumin/grid/model.py
   mgmt/trunk/cumin/python/cumin/model.py
   mgmt/trunk/cumin/python/cumin/widgets.py
Log:
 * Fix places where we were looking for "user_session" to look up the
   login session instead

 * If so configured, create a login session automatically for a
   defined user; it's used for devel


Modified: mgmt/trunk/cumin/python/cumin/grid/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/model.py	2009-11-03 20:26:30 UTC (rev 3692)
+++ mgmt/trunk/cumin/python/cumin/grid/model.py	2009-11-04 15:18:23 UTC (rev 3693)
@@ -55,10 +55,8 @@
                   stderr=None,
                   requirements="TRUE",
                   universe="VANILLA"):
-        if hasattr(session, "user_session"):
-            user_name = session.user_session.subject.name
-        else:
-            user_name = "nobody"
+        login = session.client_session.attributes["login_session"]
+        user_name = login.user.name
 
         ad = {
             "Submission":   {"TYPE": self.STRING_TYPE,

Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py	2009-11-03 20:26:30 UTC (rev 3692)
+++ mgmt/trunk/cumin/python/cumin/model.py	2009-11-04 15:18:23 UTC (rev 3693)
@@ -261,10 +261,9 @@
         now = datetime.now()
         subject = None
 
-        if hasattr(session, "user_session"):
-            subject = session.user_session.subject
+        login = session.client_session.attributes["login_session"]
 
-        invoc = TaskInvocation(self, subject, object)
+        invoc = TaskInvocation(self, login.user, object)
         invoc.status = invoc.PENDING
         invoc.start_time = now
         invoc.last_change_time = now

Modified: mgmt/trunk/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.py	2009-11-03 20:26:30 UTC (rev 3692)
+++ mgmt/trunk/cumin/python/cumin/widgets.py	2009-11-04 15:18:23 UTC (rev 3693)
@@ -58,8 +58,8 @@
             self.page.set_frame(session, child)
 
     def render_user_name(self, session):
-        if hasattr(session, "user_session"):
-            return session.user_session.subject.name
+        login = session.client_session.attributes["login_session"]
+        return login.user.name
 
     def render_logout_href(self, session):
         page = self.app.login_page
@@ -1330,12 +1330,15 @@
 
             if login.created > when:
                 return True
-            
-        # XXX
-        # if self.app.config.user:
-        #     user = Subject.getByName(self.app.config.user)
-        #     assert user
+        elif self.app.config.user:
+            user = Subject.getByName(self.app.config.user)
+            assert user
 
+            login = cumin.account.model.LoginSession(self.app, user)
+            session.client_session.attributes["login_session"] = login
+
+            return True
+
         lpage = self.app.login_page
 
         lsess = Session(lpage)
@@ -1499,3 +1502,5 @@
         outs = str(item.output_args)
 
         return ": ".join((description, status))
+
+import cumin.account.model