Scarab commit: svn commit: r10648 - trunk/src/webapp/WEB-INF/templates/screens/admin/EditUser.vm

Author: jhoech
Date: 2008-11-20 04:55:28-0800
New Revision: 10648

Modified:
   trunk/src/webapp/WEB-INF/templates/screens/admin/EditUser.vm

Log:
SCB2671: change of user data of not confirmed users is possible now without touching confirmation status
  CHG - if user is not confirmed and not deleted, the confirmation code is shown as confirmation status in EditUser screen

Modified: trunk/src/webapp/WEB-INF/templates/screens/admin/EditUser.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/admin/EditUser.vm?view=diff&rev=10648&p1=trunk/src/webapp/WEB-INF/templates/screens/admin/EditUser.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/admin/EditUser.vm&r1=10647&r2=10648
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/admin/EditUser.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/admin/EditUser.vm	2008-11-20 04:55:28-0800
@@ -113,8 +113,15 @@
  <th>*&nbsp;$l10n.AccountStatus</th>

  <td>

   <select name="accountStatus">

-   <option #if ($user2.getConfirmed().equals("CONFIRMED")) selected #end>CONFIRMED</option>

-   <option #if ($user2.getConfirmed().equals("DELETED")) selected #end>DELETED</option>

+   <option selected>$user2.getConfirmed()</option>

+   #if($user2.getConfirmed().equals("CONFIRMED"))

+   	  <option>DELETED</option>

+   #elseif($user2.getConfirmed().equals("DELETED"))

+   	  <option>CONFIRMED</option>

+   #else

+      <option>CONFIRMED</option>

+      <option>DELETED</option>

+   #end

   </select>  

  </td>

  <td/>