[Mpuls-commits] r5158 - in base/trunk: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-07-07 13:41:12 +0200 (Thu, 07 Jul 2011)
New Revision: 5158

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/security.py
Log:
* mpulsweb/lib/security.py (get_dbname_from_session)
(store_dbname_in_session): Use MPULS_UNMAPPED_DBAGENCY as the key
in the session instead of DB_NAME_FROM_LIST. The new name
describes the meaning better and better fits the (new) function
names.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-07-07 11:33:40 UTC (rev 5157)
+++ base/trunk/ChangeLog	2011-07-07 11:41:12 UTC (rev 5158)
@@ -1,5 +1,13 @@
 2011-07-07  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/lib/security.py (get_dbname_from_session)
+	(store_dbname_in_session): Use MPULS_UNMAPPED_DBAGENCY as the key
+	in the session instead of DB_NAME_FROM_LIST. The new name
+	describes the meaning better and better fits the (new) function
+	names.
+
+2011-07-07  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/security.py (get_dbname_from_list)
 	(get_dbname_from_session): Rename get_dbname_from_list to
 	get_dbname_from_session to make it clearer what the function

Modified: base/trunk/mpulsweb/lib/security.py
===================================================================
--- base/trunk/mpulsweb/lib/security.py	2011-07-07 11:33:40 UTC (rev 5157)
+++ base/trunk/mpulsweb/lib/security.py	2011-07-07 11:41:12 UTC (rev 5158)
@@ -230,7 +230,7 @@
     If it's not available in the session, the function returns None. The
     value should be stored in the session with store_dbname_in_session.
     """
-    return session.get("DB_NAME_FROM_LIST")
+    return session.get("MPULS_UNMAPPED_DBAGENCY")
 
 def store_dbname_in_session(dbname):
     """Store the KA-specific part of the database name in the session.
@@ -240,7 +240,7 @@
     application should call store_dbname_in_session before calling
     checkLogin.
     """
-    session["DB_NAME_FROM_LIST"] = dbname
+    session["MPULS_UNMAPPED_DBAGENCY"] = dbname
     session.save()
 
 def get_unmapped_db_name():