diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-01-16 11:47:20 +0000 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-01-16 11:47:20 +0000 |
| commit | 682db36dca4db6c0682deeb4fb704e8cf222e38c (patch) | |
| tree | 5811b7e2288f48b0bc814f7f505e19cb705294d9 /db/schema.sql | |
| parent | 257b658e49da3665a426f1c98d9760b0d53b8d3d (diff) | |
| parent | 3c4c0ec2f55d82502169d2313745920850efdc99 (diff) | |
Merge branch 'bromley-new-statuses'
Conflicts:
bin/send-comments
conf/crontab.ugly
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/DB/Result/Open311conf.pm
perllib/FixMyStreet/DB/ResultSet/Problem.pm
perllib/Open311.pm
t/app/controller/report_updates.t
t/open311.t
templates/web/default/report/display.html
templates/web/default/report/updates.html
templates/web/fixmystreet/report/display.html
Diffstat (limited to 'db/schema.sql')
| -rw-r--r-- | db/schema.sql | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/db/schema.sql b/db/schema.sql index 87e785de2..021c5561d 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -183,12 +183,16 @@ create table problem ( or state = 'investigating' or state = 'planned' or state = 'in progress' + or state = 'action scheduled' or state = 'closed' or state = 'fixed' or state = 'fixed - council' or state = 'fixed - user' or state = 'hidden' or state = 'partial' + or state = 'unable to fix' + or state = 'not responsible' + or state = 'duplicate' ), lang text not null default 'en-gb', service text not null default '', @@ -331,10 +335,14 @@ create table comment ( or problem_state = 'investigating' or problem_state = 'planned' or problem_state = 'in progress' + or problem_state = 'action scheduled' or problem_state = 'closed' or problem_state = 'fixed' or problem_state = 'fixed - council' or problem_state = 'fixed - user' + or problem_state = 'unable to fix' + or problem_state = 'not responsible' + or problem_state = 'duplicate' ), -- other fields? one to indicate whether this was written by the council -- and should be highlighted in the display? @@ -462,5 +470,6 @@ create table open311conf ( send_comments boolean not null default 'f', comment_user_id int references users(id), suppress_alerts boolean not null default 'f', - can_be_devolved boolean not null default 'f' + can_be_devolved boolean not null default 'f', + send_extended_statuses boolean not null default 'f' ); |