aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/admin_public_body_controller.rb3
-rw-r--r--app/models/public_body.rb4
-rw-r--r--app/views/admin_public_body/edit.rhtml7
-rw-r--r--db/migrate/034_run_solr_indexing.rb3
-rw-r--r--todo.txt33
5 files changed, 42 insertions, 8 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index ce44f4e31..79fa98475 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: admin_public_body_controller.rb,v 1.6 2008-02-21 16:02:57 francis Exp $
+# $Id: admin_public_body_controller.rb,v 1.7 2008-02-21 16:15:45 francis Exp $
class AdminPublicBodyController < ApplicationController
layout "admin"
@@ -55,6 +55,7 @@ class AdminPublicBodyController < ApplicationController
def destroy
PublicBody.find(params[:id]).destroy
+ flash[:notice] = "PublicBody was successfully destroyed."
redirect_to admin_url('body/list')
end
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index bcc31a04e..8bd3ce550 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -21,7 +21,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.18 2008-02-21 15:18:46 francis Exp $
+# $Id: public_body.rb,v 1.19 2008-02-21 16:15:45 francis Exp $
class PublicBody < ActiveRecord::Base
validates_presence_of :name
@@ -30,7 +30,7 @@ class PublicBody < ActiveRecord::Base
has_many :info_requests
- acts_as_solr :fields => [:name, :short_name]
+ #acts_as_solr :fields => [:name, :short_name]
def validate
unless MySociety::Validate.is_valid_email(self.request_email)
diff --git a/app/views/admin_public_body/edit.rhtml b/app/views/admin_public_body/edit.rhtml
index d0b0d85fb..618f69a77 100644
--- a/app/views/admin_public_body/edit.rhtml
+++ b/app/views/admin_public_body/edit.rhtml
@@ -12,3 +12,10 @@
<%= link_to 'List all', '../list' %>
</p>
+<% form_tag('../destroy/' + @public_body.id.to_s) do |f| %>
+ <p>
+ <%= hidden_field_tag(:public_body_id, { :value => @public_body.id } ) %>
+ <%= submit_tag "Destroy " + @public_body.short_name %> (this is permanent!)
+ </p>
+<% end %>
+
diff --git a/db/migrate/034_run_solr_indexing.rb b/db/migrate/034_run_solr_indexing.rb
index 8a697905c..3cdfdbde9 100644
--- a/db/migrate/034_run_solr_indexing.rb
+++ b/db/migrate/034_run_solr_indexing.rb
@@ -1,6 +1,7 @@
class RunSolrIndexing < ActiveRecord::Migration
def self.up
- PublicBody.rebuild_solr_index
+ # Not using SOLR yet after all
+ #PublicBody.rebuild_solr_index
end
def self.down
diff --git a/todo.txt b/todo.txt
index 812b29b4c..9c0dc0735 100644
--- a/todo.txt
+++ b/todo.txt
@@ -38,7 +38,7 @@ Go through all requests and check status is shiny
Next
====
-Rename frontpage to home
+Rename frontpage controller to home (or home to frontpage)
Put the admin "Public page" link on request page somewhere clearer
@@ -149,10 +149,35 @@ e.g.
Sources of public bodies
========================
-Send to MoD seems to require a form
+ * Home Office
+ * Department of Health
+ * Foreign and Commonwealth Office
+ * Department for Children, Schools and Families
+ * Department for Innovation, Universities and Skills
+ * Department for Business, Enterprise and Regulatory Reform
+ * Department for Environment, Food and Rural Affairs
+ * HM Treasury
+ * Northern Ireland Office
+ * Privy Council
+ * Wales Office
+ * Wales Office (in Welsh)
+ * Scotland Office
+ * Department for Work and Pensions
+ * Department for International Development
+ * Department for Communities and Local Government
+ * Cabinet Office
+ * Office of the Leader of the House of Commons
+
+Tricky:
+ * Ministry of Defence
+ * Department for Transport
Also DfT :( http://www.dft.gov.uk/foi/whatyouneedtoknow/foionlinefrm
-Also Met :( http://www.met.police.uk/information/metric/index.htm
-- perhaps just do them manually?
+
+Ones that require form:
+ Met :( http://www.met.police.uk/information/metric/index.htm
+Perhaps just do them manually?
+
+MoJ and NOMS should link to each other?
Schools list: www.edubase.gov.uk