[Mpuls-commits] r4250 - in jmd/trunk: . jmdweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-11-23 16:24:19 +0100 (Tue, 23 Nov 2010)
New Revision: 4250

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/model/struktur.py
Log:
* jmdweb/model/struktur.py (get_db): Adapt to get_db_parameters
changes from base/trunk r4249.


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-11-23 15:22:59 UTC (rev 4249)
+++ jmd/trunk/ChangeLog	2010-11-23 15:24:19 UTC (rev 4250)
@@ -1,3 +1,8 @@
+2010-11-23  Bernhard Herzog  <bh at intevation.de>
+
+	* jmdweb/model/struktur.py (get_db): Adapt to get_db_parameters
+	changes from base/trunk r4249.
+
 2010-11-17  Torsten Irlaender <torsten at intevation.de>
 
 	* jmdweb/templates/auth/main.mako: Fixed translation on loginpage

Modified: jmd/trunk/jmdweb/model/struktur.py
===================================================================
--- jmd/trunk/jmdweb/model/struktur.py	2010-11-23 15:22:59 UTC (rev 4249)
+++ jmd/trunk/jmdweb/model/struktur.py	2010-11-23 15:24:19 UTC (rev 4250)
@@ -43,8 +43,7 @@
 
 def get_db():
     current_user = session['USER_AUTHORIZED']
-    return DB(**get_db_parameters(getDbName(),
-                                  current_user.login,
+    return DB(**get_db_parameters(current_user.login,
                                   current_user.password,
                                   config.get('jmd.structuredb.host'),
                                   config.get('jmd.structuredb.port'),