[Mpuls-commits] r804 - in wasko/branches/2.0: . waskaweb/templates/administration

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-21 16:45:09 +0100 (Thu, 21 Jan 2010)
New Revision: 804

Modified:
   wasko/branches/2.0/ChangeLog.txt
   wasko/branches/2.0/waskaweb/templates/administration/new_user.mako
Log:
* waskaweb/templates/administration/new_user.mako: Remove
evaluation server parts.  Cleaner handling of adm user.


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-21 15:39:01 UTC (rev 803)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-21 15:45:09 UTC (rev 804)
@@ -1,5 +1,10 @@
 2010-01-21  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/templates/administration/new_user.mako: Remove
+	evaluation server parts.  Cleaner handling of adm user.
+
+2010-01-21  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/templates/administration/new_user.mako: Fix formatting.
 
 2010-01-21  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/templates/administration/new_user.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/new_user.mako	2010-01-21 15:39:01 UTC (rev 803)
+++ wasko/branches/2.0/waskaweb/templates/administration/new_user.mako	2010-01-21 15:45:09 UTC (rev 804)
@@ -98,24 +98,12 @@
         </div>
         <div class="w50">
           <label for="role">${_('adm_form_user_role')}</label><br>
-          % if h.getLogin() != 'adm':
-            <select name="role" id="role">
-              % if c.isEvaluationServer:
-                <option value="PB">PB</option>
-              % else:
-                <option value="CM" >CM</option>
-              % endif
-              <option value="Admin">Admin</option>
-            </select>
-          % else:
-            % if c.isEvaluationServer:
-              PB
-              <input type="hidden" name="role" value="PB">
-            % else:
-              Admin
-              <input type="hidden" name="role" value="Admin">
+          <select name="role" id="role">
+            % if h.getLogin() != 'adm':
+              <option value="CM" >CM</option>
             % endif
-          % endif
+            <option value="Admin">Admin</option>
+          </select>
         </div>
         <div class="w100">
           <input type="checkbox" name="activated" id="activated" value="1"