elections.sql | 11 +++++++----
elections/admin.py | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 40ee719fbf3da0ac056eab4b2dfc8303f8404691
Merge: 6e17390... a2db00d...
Author: Nigel Jones <nigelj(a)fedoraproject.org>
Date: Sat Nov 28 08:21:26 2009 +1000
Merge branch 'master' of
ssh://fedorahosted.org/git/elections
commit 6e17390790747975502d3d15d06498a3cc534db8
Author: Nigel Jones <nigelj(a)fedoraproject.org>
Date: Fri Nov 27 18:33:18 2009 +1000
Fix missing comma
diff --git a/elections/admin.py b/elections/admin.py
index 2f7f7d1..a9fd772 100644
--- a/elections/admin.py
+++ b/elections/admin.py
@@ -65,7 +65,7 @@ class Admin(controllers.Controller):
if "usefas" not in kw:
usefas=0
- Elections(alias=kw['alias'], status=0, method=0,
shortdesc=kw['shortdesc'], description=kw['info'], url=kw['url'],
start_date=kw['startdate'], end_date=kw['enddate'], embargoed=setembargo,
seats_elected=kw['seats'],usefas=usefasvotes_per_user=1)
+ Elections(alias=kw['alias'], status=0, method=0,
shortdesc=kw['shortdesc'], description=kw['info'], url=kw['url'],
start_date=kw['startdate'], end_date=kw['enddate'], embargoed=setembargo,
seats_elected=kw['seats'],usefas=usefas,votes_per_user=1)
raise turbogears.redirect("/")
else:
return dict()
commit e46114351faa5fe36c612f548831a9fd7fb9fbe6
Author: Nigel Jones <nigelj(a)fedoraproject.org>
Date: Fri Nov 27 17:44:17 2009 +1000
Minor update again to bring it in line with whats actually required.
diff --git a/elections.sql b/elections.sql
index 1b9a900..2f0636c 100644
--- a/elections.sql
+++ b/elections.sql
@@ -17,12 +17,14 @@ CREATE TABLE elections (
-- was info
description text NOT NULL,
url text NOT NULL,
- start_date timestamp NOT NULL,
- end_date timestamp NOT NULL,
+ start_date timestamp without time zone NOT NULL,
+ end_date timestamp without time zone NOT NULL,
-- was max_seats
seats_elected integer NOT NULL,
votes_per_user integer NOT NULL,
- embargoed integer default 0 not null,
+ embargoed integer default 0 NOT NULL,
+ usefas integer default 0 NOT NULL,
+ allow_nominations integer default 0 NOT NULL,
unique (shortdesc),
primary key (id)
);
@@ -32,6 +34,7 @@ CREATE TABLE candidates (
election_id integer NOT NULL,
name text NOT NULL,
url text,
+ formalname text,
human integer,
status integer,
foreign key (election_id) references elections (id),
@@ -50,7 +53,7 @@ CREATE TABLE legalvoters (
CREATE TABLE votes (
id serial,
voter text NOT NULL,
- "timestamp" timestamp without time zone NOT NULL,
+ timestamp timestamp without time zone NOT NULL,
candidate_id integer NOT NULL,
weight integer NOT NULL,
election_id integer NOT NULL,