From e05f35858b30fe954bc1cf648179844df2e09906 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky@fedoraproject.org>
Date: Wed, 5 Mar 2008 11:22:30 -0500
Subject: [PATCH] Make account status actually get info.

---
 fas/fas/templates/user/view.html | 8 +++++---
 fas/fas/user.py                  | 1 +
 fas/fas2.sql                     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/fas/fas/templates/user/view.html b/fas/fas/templates/user/view.html
index eea161a..9fa786b 100644
--- a/fas/fas/templates/user/view.html
+++ b/fas/fas/templates/user/view.html
@@ -23,10 +23,12 @@
         <py:if test="personal"><dt>${_('Postal Address:')}</dt><dd>${person.postal_address}&nbsp;</dd></py:if>
         <dt>${_('Comments:')}</dt><dd>${person.comments}&nbsp;</dd>
         <py:if test="personal"><dt>${_('Password:')}</dt><dd><span class="approved">${_('Valid')}</span> <a href="${tg.url('/user/changepass')}">(change)</a></dd></py:if>
-        <!-- TODO: Make this actually get data -->
-        <dt>${_('Account Status:')}</dt><dd><span class="approved">${_('Valid')}</span>
+        <dt>${_('Account Status:')}</dt><dd>
+        <span py:if="person.status == 'active'" class="approved">${_('Active')}</span>
+        <span py:if="person.status == 'vacation'" class="approved">${_('Vacation')}</span>
+        <span py:if="person.status == 'inactive'" class="unapproved">${_('Inactive')}</span>
+        <span py:if="person.status == 'pinged'" class="approved">${_('Pinged')}</span>
         <script type="text/javascript">var hb1 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/user_account_status')}'});</script></dd>
-        <!-- cla = {None, 'signed', 'clicked'} -->
         <dt>${_('CLA:')}</dt><dd>
         <span py:if="cla == 'signed'" class="approved">${_('Signed CLA')}</span>
         <span py:if="cla == 'clicked'" class="approved">${_('Click-through CLA')}<py:if test="personal">(<a href="${tg.url('/cla/')}">${_('GPG Sign it!')}</a></py:if>)</span>
diff --git a/fas/fas/user.py b/fas/fas/user.py
index 51e5509..c6831f0 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -273,6 +273,7 @@ class User(controllers.Controller):
             person.human_name = human_name
             person.telephone = telephone
             person.password = '*'
+            person.status = 'active'
             person.emails['primary'] = PersonEmails(email=email, purpose='primary')
             newpass = generate_password()
             message = turbomail.Message(config.get('accounts_mail'), person.emails['primary'].email, _('Welcome to the Fedora Project!'))
diff --git a/fas/fas2.sql b/fas/fas2.sql
index 0674f57..1892c60 100644
--- a/fas/fas2.sql
+++ b/fas/fas2.sql
@@ -56,7 +56,7 @@ CREATE TABLE people (
     internal_comments TEXT,
     ircnick TEXT,
     last_seen TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
-    status TEXT,
+    status TEXT DEFAULT 'active',
     status_change TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
     locale TEXT not null DEFAULT 'C',
     timezone TEXT null DEFAULT 'UTC',