aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/kasabi4
-rw-r--r--web/cobrands/fixmystreet/_base.scss6
2 files changed, 9 insertions, 1 deletions
diff --git a/bin/kasabi b/bin/kasabi
index 5b99ba4ff..456b2f4d1 100755
--- a/bin/kasabi
+++ b/bin/kasabi
@@ -63,7 +63,7 @@ def main():
report['detail'] = tidy_string(report['detail'])
report['confirmed'] = report['confirmed'].replace(microsecond=0).isoformat() # Don't want microseconds
report['lastupdate'] = report['lastupdate'].replace(microsecond=0).isoformat()
- report['council'] = sorted(re.sub('\|.*', '', report['council']).split(',')) # Remove missing councils
+ report['council'] = sorted(re.sub('\|.*', '', report['council'] or '').split(',')) # Remove missing councils
# Fetch updates to note state changes
states = [ { 'state': 'confirmed', 'time': report['confirmed'] } ]
@@ -166,6 +166,7 @@ class FixMyStreetChangeSet(object):
# Get info for the councils
council_data = { 'sentTo': '', 'areaNames': [] }
for council in report['council']:
+ if not council: continue
js = json.load(urllib.urlopen('http://mapit.mysociety.org/area/{0}'.format(council)))
os_id = int(js['codes']['unit_id']) + 7000000000000000
if report['whensent']:
@@ -173,6 +174,7 @@ class FixMyStreetChangeSet(object):
council_data['areaNames'].append(js['name'])
council_data.setdefault('firstCouncil', council)
council_data['areaNames'] = ' / '.join(council_data['areaNames'])
+ council_data.setdefault('firstCouncil', '0')
# easting/northing
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index a0397bb4b..4d3b36888 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -153,6 +153,12 @@ select, input, textarea {
font-size: 99%;
max-width: 95%;
}
+.ie7 {
+ select, input, textarea {
+ max-width: none;
+ }
+}
+
// To deal with bug from drop-down being wider than holder
select {
width: 100%;