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

Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure

Browse source
This commit is contained in:
Toshio Kuratomi 2008-03-11 17:53:47 -07:00
commit c9b921a6cd
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fas/fas/templates/welcome.html
View file

@ -15,7 +15,7 @@
</head> </head>
<body> <body>
<p> <p>
${_('Welcome to the Fedora Accounts System 2. This system is not yet live so feel free to play around. Just don\'t expect it to work.')} ${_('Welcome to the Fedora Accounts System 2. Please submit bugs to https://fedorahosted.org/fedora-infrastructure/ or stop by #fedora-admin on irc.freenode.net')}
</p> </p>
<ul> <ul>
<li><a href="${tg.url('/login')}">${_('Log In')}</a></li> <li><a href="${tg.url('/login')}">${_('Log In')}</a></li>

4
fas/fas/user.py
View file

@ -474,11 +474,11 @@ Please go to https://admin.fedoraproject.org/fas/ to change it.
try: try:
person.password = newpass['hash'] person.password = newpass['hash']
turbogears.flash(_('Your new password has been emailed to you.')) turbogears.flash(_('Your new password has been emailed to you.'))
turbogears.redirect('/login')
return dict()
except: except:
turbogears.flash(_('Your password could not be reset.')) turbogears.flash(_('Your password could not be reset.'))
return dict() return dict()
turbogears.redirect('/login')
return dict()
@identity.require(turbogears.identity.not_anonymous()) @identity.require(turbogears.identity.not_anonymous())
@expose(template="genshi-text:fas.templates.user.cert", format="text", content_type='text/plain; charset=utf-8') @expose(template="genshi-text:fas.templates.user.cert", format="text", content_type='text/plain; charset=utf-8')

4
fas/fas2.sql
View file

@ -98,7 +98,7 @@ CREATE TABLE groups (
-- tg_group::display_name -- tg_group::display_name
display_name TEXT, display_name TEXT,
-- Unlike users, groups can share email addresses -- Unlike users, groups can share email addresses
email TEXT not null, email TEXT,
emailtoken TEXT, emailtoken TEXT,
unverified_email TEXT, unverified_email TEXT,
owner_id INTEGER NOT NULL REFERENCES people(id), owner_id INTEGER NOT NULL REFERENCES people(id),
@ -341,7 +341,7 @@ create trigger email_bugzilla_sync before update on people
for each row execute procedure bugzilla_sync_email(); for each row execute procedure bugzilla_sync_email();
-- For Fas to connect to the database -- For Fas to connect to the database
GRANT ALL ON TABLE people, groups, person_roles, group_roles, bugzilla_queue, configs, person_seq, visit, visit_identity, log, log_id_seq, TO GROUP fedora; GRANT ALL ON TABLE people, groups, person_roles, group_roles, bugzilla_queue, configs, person_seq, visit, visit_identity, log, log_id_seq TO GROUP fedora;
-- Create default admin user - Default Password "admin" -- Create default admin user - Default Password "admin"
INSERT INTO people (id, username, human_name, password, email) VALUES (100001, 'admin', 'Admin User', '$1$djFfnacd$b6NFqFlac743Lb4sKWXj4/', 'root@localhost'); INSERT INTO people (id, username, human_name, password, email) VALUES (100001, 'admin', 'Admin User', '$1$djFfnacd$b6NFqFlac743Lb4sKWXj4/', 'root@localhost');