Infrastructure/fedora-infrastructure
3
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Make account status actually get info.

Browse source
This commit is contained in:
Ricky Zhou (周家杰) 2008-03-05 11:22:30 -05:00
parent 6530347faf
commit e05f35858b
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fas/fas/templates/user/view.html
View file

@ -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>

1
fas/fas/user.py
View file

@ -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!'))

2
fas/fas2.sql
View file

@ -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',