From f6707f973560e1ab4072c22326b0f24e81987197 Mon Sep 17 00:00:00 2001 From: Michael McGrath Date: Tue, 11 Mar 2008 19:29:15 -0500 Subject: [PATCH 1/3] groups can have a null email --- fas/fas2.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fas/fas2.sql b/fas/fas2.sql index e285366..2b5fb64 100644 --- a/fas/fas2.sql +++ b/fas/fas2.sql @@ -98,7 +98,7 @@ CREATE TABLE groups ( -- tg_group::display_name display_name TEXT, -- Unlike users, groups can share email addresses - email TEXT not null, + email TEXT, emailtoken TEXT, unverified_email TEXT, owner_id INTEGER NOT NULL REFERENCES people(id), @@ -575,7 +575,7 @@ create trigger role_bugzilla_sync before update or insert or delete -- for each row execute procedure bugzilla_sync_email(); -- 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" INSERT INTO people (id, username, human_name, password, email) VALUES (100001, 'admin', 'Admin User', '$1$djFfnacd$b6NFqFlac743Lb4sKWXj4/', 'root@localhost'); From bd03e07816887cc9da40f5b0e5da42d6468a2e4b Mon Sep 17 00:00:00 2001 From: Michael McGrath Date: Tue, 11 Mar 2008 19:35:38 -0500 Subject: [PATCH 2/3] turbogears.redirect I believe causes a raise which makes this block of code not work as expected" --- fas/fas/user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fas/fas/user.py b/fas/fas/user.py index a1095e9..eeae01f 100644 --- a/fas/fas/user.py +++ b/fas/fas/user.py @@ -474,11 +474,11 @@ Please go to https://admin.fedoraproject.org/fas/ to change it. try: person.password = newpass['hash'] turbogears.flash(_('Your new password has been emailed to you.')) - turbogears.redirect('/login') - return dict() except: turbogears.flash(_('Your password could not be reset.')) return dict() + turbogears.redirect('/login') + return dict() @identity.require(turbogears.identity.not_anonymous()) @expose(template="genshi-text:fas.templates.user.cert", format="text", content_type='text/plain; charset=utf-8') From 14ff2b92ce271da4e82e01f3a079d131e9071b47 Mon Sep 17 00:00:00 2001 From: Michael McGrath Date: Tue, 11 Mar 2008 19:38:30 -0500 Subject: [PATCH 3/3] fix welcome message --- fas/fas/templates/welcome.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fas/fas/templates/welcome.html b/fas/fas/templates/welcome.html index 137f16e..e4bbae9 100644 --- a/fas/fas/templates/welcome.html +++ b/fas/fas/templates/welcome.html @@ -15,7 +15,7 @@

- ${_('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')}