diff options
| -rw-r--r-- | app/models/info_request.rb | 4 | ||||
| -rw-r--r-- | app/views/admin_public_body/edit.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/new.rhtml | 3 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 6 | ||||
| -rw-r--r-- | spec/controllers/request_controller_spec.rb | 4 | ||||
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 2 | ||||
| -rw-r--r-- | todo.txt | 3 |
7 files changed, 15 insertions, 9 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 43b37a454..9bd40e892 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -19,7 +19,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.42 2008-02-21 20:10:21 francis Exp $ +# $Id: info_request.rb,v 1.43 2008-02-21 20:41:18 francis Exp $ require 'digest/sha1' @@ -208,7 +208,7 @@ public end end if earliest.nil? - raise "internal error, date_response_required_by gets nil for request " + self.id.to_s + " outgoing messages count " + self.outgoing_messages.size.to_s + raise "internal error, date_response_required_by gets nil for request " + self.id.to_s + " outgoing messages count " + self.outgoing_messages.size.to_s + " all events: " + events.to_yaml end earliest_sent = earliest.last_sent_at diff --git a/app/views/admin_public_body/edit.rhtml b/app/views/admin_public_body/edit.rhtml index 618f69a77..3a1fda3e9 100644 --- a/app/views/admin_public_body/edit.rhtml +++ b/app/views/admin_public_body/edit.rhtml @@ -12,7 +12,7 @@ <%= link_to 'List all', '../list' %> </p> -<% form_tag('../destroy/' + @public_body.id.to_s) do |f| %> +<% form_tag('../destroy/' + @public_body.id.to_s) do %> <p> <%= hidden_field_tag(:public_body_id, { :value => @public_body.id } ) %> <%= submit_tag "Destroy " + @public_body.short_name %> (this is permanent!) diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index 8aa627194..89bc10917 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -42,10 +42,9 @@ <p> <label class="form_label" for="info_request_public_body_id">To:</label> - <h2><%=h(@info_request.public_body.name)%></h2> + <span id="to_public_body"><%=h(@info_request.public_body.name)%></span> </p> - <p> <label class="form_label" for="info_request_title">Summary:</label> <%= f.text_field :title, :size => 50 %> diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 42c22b45a..c656a503a 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -293,6 +293,12 @@ div.auto_complete ul strong.highlight { margin-left: 12em; } +#to_public_body { + font-size: 140%; + font-weight: bold; +} + + /* /list - browsing requests */ table#list_requests { border-collapse: collapse; diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index 07a856585..b97cfcf12 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -89,9 +89,9 @@ describe RequestController, "when creating a new request" do integrate_views fixtures :info_requests, :outgoing_messages, :public_bodies, :users - it "should render with 'new' template" do + it "should redirect to front page if no public body specified" do get :new - response.should render_template('new') + response.should redirect_to(:action => 'frontpage') end it "should accept a public body parameter posted from the front page" do diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 7ca0bc27c..ad8b4a6d4 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe UserController, "when showing a user" do integrate_views - fixtures :users, :outgoing_messages, :incoming_messages + fixtures :users, :outgoing_messages, :incoming_messages, :info_requests, :info_request_events it "should be successful" do get :show, :simple_name => "bob-smith" @@ -38,7 +38,6 @@ Go through all requests and check status is shiny Next ==== -Show other requests to same public body on write page Browse all public bodies Lucene for search - use http://acts-as-solr.rubyforge.org/ @@ -56,6 +55,8 @@ eived from server "/data/vhost/foi.mysociety.org/docs/dispatch.fcgi" Later ===== +Contact form doesn't get IP on live site + Consider on staging sites making follow ups go to dummy address also Make the email address for responses |