diff options
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/admin_public_body/list.rhtml | 3 | ||||
| -rw-r--r-- | spec/controllers/admin_public_body_controller_spec.rb | 10 | ||||
| -rw-r--r-- | todo.txt | 9 |
4 files changed, 15 insertions, 11 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index 1dc679b31..bc2dd90fa 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.3 2007-09-03 13:52:01 francis Exp $ +# $Id: admin_public_body_controller.rb,v 1.4 2007-11-13 12:59:53 francis Exp $ class AdminPublicBodyController < ApplicationController layout "admin" @@ -19,7 +19,7 @@ class AdminPublicBodyController < ApplicationController :redirect_to => { :action => :list } def list - @public_body_pages, @public_bodies = paginate :public_bodies, :per_page => 10 + @public_bodies = PublicBody.paginate :order => "name", :page => params[:page], :per_page => 10 end def show diff --git a/app/views/admin_public_body/list.rhtml b/app/views/admin_public_body/list.rhtml index e8eaf4b52..6f3b8886a 100644 --- a/app/views/admin_public_body/list.rhtml +++ b/app/views/admin_public_body/list.rhtml @@ -21,8 +21,7 @@ <% end %> </table> -<%= link_to 'Previous page', { :page => @public_body_pages.current.previous } if @public_body_pages.current.previous %> -<%= link_to 'Next page', { :page => @public_body_pages.current.next } if @public_body_pages.current.next %> +<%= will_paginate(@public_bodies) %> <br /> diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb index f696c6f8a..0b2541f8e 100644 --- a/spec/controllers/admin_public_body_controller_spec.rb +++ b/spec/controllers/admin_public_body_controller_spec.rb @@ -1,9 +1,11 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe AdminPublicBodyController, "when routing requests" do +describe AdminPublicBodyController, "when administering public bodies" do + integrate_views + fixtures :public_bodies - it "should map { :controller => 'admin_public_body', :action => 'list' } to /admin/body/list" do - route_for(:controller => "admin_public_body", :action => "list").should == "/admin/body/list" - end + it "show the index page" do + get :index + end end @@ -1,6 +1,5 @@ Check confirmed everywhere in password check etc. - Next ==== @@ -19,12 +18,16 @@ Make it validate the HTML Check we call integrate_views for all controllers Test that actually sending request outgoing mail using deliveries -Remove "Outgoing messages is invalid" +Remove "Outgoing messages is invalid" error + Tidying ======= -Add indices to token / email_token in post_redirects +Bubbles don't validate +http://localhost:3000/request/5 + +Add SQL database indexes to token / email_token in post_redirects Prevent double posting of same request |