[Mpuls-commits] r12 - in trunk: . waskaweb/i18n/de/LC_MESSAGES waskaweb/model waskaweb/templates/usersettings

[scm-commit@wald.intevation.org]

Author: thomas
Date: 2008-08-13 15:03:45 +0200 (Wed, 13 Aug 2008)
New Revision: 12

Modified:
   trunk/ChangeLog.txt
   trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   trunk/waskaweb/model/user.py
   trunk/waskaweb/templates/usersettings/edit_standin.mako
Log:
Load 331819765174 into trunk.


Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt	2008-08-13 13:03:20 UTC (rev 11)
+++ trunk/ChangeLog.txt	2008-08-13 13:03:45 UTC (rev 12)
@@ -1,5 +1,9 @@
 2007-11-30  Torsten Irl�nder <torsten.irlaender at intevation.de>
 
+	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Tagged Beta 5
+
+2007-11-30  Torsten Irl�nder <torsten.irlaender at intevation.de>
+
 	* waskaweb/controllers/administration.py,
 	  waskaweb/templates/main.mako,
 	  waskaweb/templates/main_login.mako,

Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-08-13 13:03:20 UTC (rev 11)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-08-13 13:03:45 UTC (rev 12)
@@ -128,7 +128,7 @@
 
 #: waskaweb/templates/main.mako:175
 msgid "footer_version"
-msgstr "23.11.07 | Beta 3"
+msgstr "30.11.07 | Beta 6"
 
 #: waskaweb/templates/main_login.mako:38
 #: waskaweb/templates/start/responsible.mako:71

Modified: trunk/waskaweb/model/user.py
===================================================================
--- trunk/waskaweb/model/user.py	2008-08-13 13:03:20 UTC (rev 11)
+++ trunk/waskaweb/model/user.py	2008-08-13 13:03:45 UTC (rev 12)
@@ -145,7 +145,7 @@
         self.standin = -1 
 
         # Load existing user?
-        if (not id is None) and (str(id) != '-1'):
+        if not id is None:
             #SuperAdmin
             if str(id) == '0':                 
                 self.setAdmUser()

Modified: trunk/waskaweb/templates/usersettings/edit_standin.mako
===================================================================
--- trunk/waskaweb/templates/usersettings/edit_standin.mako	2008-08-13 13:03:20 UTC (rev 11)
+++ trunk/waskaweb/templates/usersettings/edit_standin.mako	2008-08-13 13:03:45 UTC (rev 12)
@@ -29,10 +29,10 @@
           <option value="${u.id}">${u.first_name}, ${u.last_name}</option>
         % endif
       % endfor
-        % if c.uo.standin == -1:
-          <option value="-1" selected>Keine Vertretung</option>
+        % if c.uo.standin is None:
+          <option value="" selected>Keine Vertretung</option>
         % else:
-          <option value="-1">Keine Vertretung</option>
+          <option value="">Keine Vertretung</option>
         % endif
     </select>
   </div>