aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/public_body.rb10
-rw-r--r--todo.txt10
2 files changed, 12 insertions, 8 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index a873cb73a..806fbea6f 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -24,7 +24,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: public_body.rb,v 1.118 2008-10-31 20:45:41 johncross Exp $
+# $Id: public_body.rb,v 1.119 2008-11-03 21:34:52 francis Exp $
require 'csv'
require 'set'
@@ -246,7 +246,9 @@ class PublicBody < ActiveRecord::Base
if PublicBody.categories_by_tag.include?(tag.name)
desc = PublicBody.category_singular_by_tag[tag.name]
if first
- desc = desc.capitalize
+ # terrible that Ruby/Rails doesn't have an equivalent of ucfirst
+ # (capitalize shockingly converts later characters to lowercase)
+ desc = desc[0,1].capitalize + desc[1,desc.size]
first = false
end
if html
@@ -257,7 +259,9 @@ class PublicBody < ActiveRecord::Base
end
end
if types.size > 0
- types.join(", ")
+ ret = types[0, types.size - 1].join(", ")
+ ret = ret + " and " + types[-1]
+ return ret
else
return "A public authority"
end
diff --git a/todo.txt b/todo.txt
index 2754c5fa0..3c2d9794e 100644
--- a/todo.txt
+++ b/todo.txt
@@ -37,16 +37,11 @@ Next
Make green box more visible when click reminder email link
Check new wording in reminder email looks good
-Consider putting the request email address in footer? So when
-forwarded about, address sticks there.
-
Make it so you definitely don't get alert for the annotation that you just made
The Issue document here doesn't load - need to decect word docs from file content.
http://www.whatdotheyknow.com/request/monitoring_of_foi_internal_revie
-Awaiting internal review overdue?
-
Do something about <title> of views
Performance:
@@ -70,6 +65,8 @@ Internal review status/marker?
(search for phrase "internal review"!)
Remember - internal reviews can be *aborted* if they just send the response :)
+Awaiting internal review overdue state?
+
Request withdrawn by user status/marker?
- When you say rejected and go to /help/unhappy should have link to
@@ -111,6 +108,9 @@ http://www.whatdotheyknow.com/body/exeter_college
Later
=====
+Consider putting the request email address in footer? So when
+forwarded about, address sticks there.
+
Knackered view as HTML:
http://www.whatdotheyknow.com/request/statistics_for_allocation_of_dut#incoming-4793
http://www.whatdotheyknow.com/request/post_lawrence_report_diversity_t_7#incoming-5483