aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/controllers/application.rb4
-rw-r--r--app/controllers/request_controller.rb4
-rw-r--r--app/helpers/application_helper.rb10
-rw-r--r--app/views/body/show.rhtml2
-rw-r--r--app/views/layouts/default.rhtml7
-rw-r--r--app/views/request/frontpage.rhtml2
-rw-r--r--app/views/request/list.rhtml6
-rw-r--r--app/views/request/show.rhtml4
-rw-r--r--app/views/user/index.rhtml2
-rw-r--r--config/routes.rb22
10 files changed, 36 insertions, 27 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 1181e6ad6..e86fe7338 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -6,7 +6,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: application.rb,v 1.14 2007-10-15 22:38:27 louise Exp $
+# $Id: application.rb,v 1.15 2007-10-16 21:17:14 louise Exp $
class ApplicationController < ActionController::Base
@@ -91,7 +91,7 @@ class ApplicationController < ActionController::Base
unless session[:user]
session[:intended_uri] = @request.request_uri
session[:intended_params] = params
- redirect_to :controller => 'user', :action => "signin"
+ redirect_to signin_url
return false
end
return true
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 48dea8e54..dfc614e59 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_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: request_controller.rb,v 1.4 2007-10-16 07:11:13 francis Exp $
+# $Id: request_controller.rb,v 1.5 2007-10-16 21:17:14 louise Exp $
class RequestController < ApplicationController
@@ -42,7 +42,7 @@ class RequestController < ApplicationController
@info_request.user = authenticated_user
@info_request.save
flash[:notice] = "Your Freedom of Information request has been created."
- redirect_to :controller => 'request', :action => "show", :id => @info_request
+ redirect_to request_url(:id => @info_request)
end
# Save both models
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b3c62fc5e..55e71a42e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.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: application_helper.rb,v 1.6 2007-10-09 20:02:13 francis Exp $
+# $Id: application_helper.rb,v 1.7 2007-10-16 21:17:14 louise Exp $
module ApplicationHelper
@@ -38,6 +38,14 @@ module ApplicationHelper
def simple_date(date)
return date.strftime("%e %B %Y")
end
+
+ def request_link(info_request)
+ link_to h(info_request.title), request_url(:id => info_request)
+ end
+
+ def public_body_link(public_body)
+ link_to h(public_body.short_name), public_body_url(:short_name => public_body.short_name)
+ end
end
diff --git a/app/views/body/show.rhtml b/app/views/body/show.rhtml
index 63e2c7b4c..46753dfd7 100644
--- a/app/views/body/show.rhtml
+++ b/app/views/body/show.rhtml
@@ -5,7 +5,7 @@
<p>Freedom of Information requests made to this body:</p>
<ul>
<% for info_request in @public_body.info_requests %>
-<li><%= link_to h(info_request.title), :controller => 'request', :action => 'show', :id => info_request %></li>
+<li><%= link_to h(info_request.title), request_url(:id => info_request) %></li>
<% end %>
</ul>
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index fe519a4ad..b645876e7 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -14,7 +14,7 @@
<div id="tagline">Freeing your information from them</div>
</div>
<ul id="navigation">
- <li><a href="/list">All Requests</a></li>
+ <li><%= link_to "All Requests", request_list_url %></li>
<li><a href="/new">New Request</a></li>
<!-- <li><a href="/my">My Requests</a></li> -->
<!-- <li><a href="/about">About</a></li> -->
@@ -23,9 +23,10 @@
<% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %>
<div id="logged_in_bar">
<% if @user %>
- Hello, <%=h(@user.name)%>! (<%= link_to "Logout", :controller => 'user', :action => 'signout', :r => request.request_uri %>)
+ Hello, <%=h(@user.name)%>!
+ (<%= link_to "Logout", signout_url(:r => request.request_uri) %>)
<% else %>
- Hello! (<%= link_to "Login or register", { :controller => 'user', :action => 'signin', :r => request.request_uri } %>)
+ Hello! (<%= link_to "Login or register", signin_url(:r => request.request_uri) %>)
<% end %>
</div>
<% end %>
diff --git a/app/views/request/frontpage.rhtml b/app/views/request/frontpage.rhtml
index e498418fa..43d641a06 100644
--- a/app/views/request/frontpage.rhtml
+++ b/app/views/request/frontpage.rhtml
@@ -3,7 +3,7 @@
<div id="make_requests">
<h1>Make requests for information from the UK Government</h1>
- <% form_for(:info_request, @info_request, :url => { :controller => :request, :action => :new }, :html => { :id => 'public_body_form', :class => 'plaque' } ) do |f| %>
+ <% form_for(:info_request, @info_request, :url => new_request_url, :html => { :id => 'public_body_form', :class => 'plaque' } ) do |f| %>
<p>Choose which public body you would like information from.</p>
<%= @public_bodies = PublicBody.find(:all, :order => "name")
f.collection_select(:public_body_id, @public_bodies, :id, :name) %>
diff --git a/app/views/request/list.rhtml b/app/views/request/list.rhtml
index a8f2d311d..9316ab576 100644
--- a/app/views/request/list.rhtml
+++ b/app/views/request/list.rhtml
@@ -13,9 +13,9 @@
<% for info_request in @info_requests %>
<tr class="<%= cycle('odd', 'even') %>">
- <td><%= link_to h(info_request.public_body.short_name), :controller => 'body', :action => 'show', :short_name => info_request.public_body.short_name %></td>
- <td><%= link_to h(info_request.title), :controller => 'request', :action => 'show', :id => info_request %></td>
- <td><%= link_to h(info_request.user.name), :controller => 'user', :action => 'index', :name => info_request.user.name %></td>
+ <td><%= public_body_link(info_request.public_body) %></td>
+ <td><%= request_link(info_request) %></td>
+ <td><%= link_to h(info_request.user.name), show_user_url(:name => info_request.user.name) %></td>
<td><%= simple_date(info_request.created_at) %></td>
</tr>
<% end %>
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index 05aa1b822..acde44703 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -4,12 +4,12 @@
<p>
Request to
-<%= link_to h(@info_request.public_body.name), :controller => 'body', :action => 'show', :short_name => @info_request.public_body.short_name %>
+<%= public_body_link(@info_request.public_body) %>
</p>
<p>
Created by
-<%= link_to h(@info_request.user.name), :controller => 'user', :action => 'index', :name => @info_request.user.name %>
+<%= link_to h(@info_request.user.name), show_user_url(:name => @info_request.user.name) %>
on <%= simple_date(@info_request.created_at) %>
</p>
diff --git a/app/views/user/index.rhtml b/app/views/user/index.rhtml
index 77c378f4c..c4264cb81 100644
--- a/app/views/user/index.rhtml
+++ b/app/views/user/index.rhtml
@@ -11,7 +11,7 @@
<p>Freedom of Information requests made by this person:</p>
<ul>
<% for info_request in display_user.info_requests %>
- <li><%= link_to h(info_request.title), :controller => 'request', :action => 'show', :id => info_request %></li>
+ <li><%= link_to h(info_request.title), request_url(:id => info_request) %></li>
<% end %>
</ul>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 1176d410b..7d4e0c3f0 100644
--- a/config/routes.rb
+++ b/config/routes.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: routes.rb,v 1.14 2007-10-16 07:11:15 francis Exp $
+# $Id: routes.rb,v 1.15 2007-10-16 21:17:15 louise Exp $
ActionController::Routing::Routes.draw do |map|
# The priority is based upon order of creation: first created -> highest priority.
@@ -14,21 +14,21 @@ ActionController::Routing::Routes.draw do |map|
# Keep in mind you can assign values other than :controller and :action
map.with_options :controller => 'request' do |request|
- request.connect '/request/:id', :action => 'show'
- request.connect '/list', :action => 'list'
- request.connect '/', :action => 'frontpage'
- request.connect '/new', :action => 'new'
- request.connect '/create', :action => 'create'
+ request.home '/', :action => 'frontpage'
+ request.request_list '/list', :action => 'list'
+ request.new_request '/new', :action => 'new'
+ request.create_request '/create', :action => 'create'
+ request.request '/request/:id', :action => 'show'
end
map.with_options :controller => 'user' do |user|
- user.connect '/signin', :action => 'signin'
- user.connect '/signup', :action => 'signup'
- user.connect '/signout', :action => 'signout'
- user.connect "/user/:name", :action => 'index'
+ user.signin '/signin', :action => 'signin'
+ user.signup '/signup', :action => 'signup'
+ user.signout '/signout', :action => 'signout'
+ user.show_user "/user/:name", :action => 'index'
end
- map.connect "/body/:short_name", :controller => 'body', :action => 'show'
+ map.public_body "/body/:short_name", :controller => 'body', :action => 'show'
map.connect '/admin/:action', :controller => 'admin', :action => 'index'
map.connect '/admin/body/:action/:id', :controller => 'admin_public_body'
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-24 01:02:41 +0000