diff options
| -rw-r--r-- | app/controllers/reports_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/reports/new.html.erb | 2 | ||||
| -rw-r--r-- | app/views/request/_sidebar.html.erb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 4 | ||||
| -rw-r--r-- | spec/controllers/reports_controller_spec.rb | 18 |
5 files changed, 15 insertions, 15 deletions
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 070a91421..924eb0108 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -1,6 +1,6 @@ class ReportsController < ApplicationController def create - info_request = InfoRequest.find_by_url_title!(params[:url_title]) + info_request = InfoRequest.find_by_url_title!(params[:request_id]) if !authenticated_user flash[:notice] = _("You need to be logged in to report a request for administrator attention") elsif info_request.attention_requested @@ -13,7 +13,7 @@ class ReportsController < ApplicationController end def new - @info_request = InfoRequest.find_by_url_title!(params[:url_title]) + @info_request = InfoRequest.find_by_url_title!(params[:request_id]) if authenticated?( :web => _("To report this request"), :email => _("Then you can report the request '{{title}}'", :title => @info_request.title), diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb index 11b682282..58e80f3ad 100644 --- a/app/views/reports/new.html.erb +++ b/app/views/reports/new.html.erb @@ -8,7 +8,7 @@ </p> <p>Why specifically do you consider this request unsuitable?</p> - <%= form_tag request_report_path(:url_title => @info_request.url_title) do %> + <%= form_tag request_report_path(:request_id => @info_request.url_title) do %> <p> <label class="form_label" for="reason">Reason:</label> <%= select_tag :reason, options_for_select(["Contains defamatory material", "Not a valid request", "Request for personal information", "Contains personal information", "Vexatious", "Other"]), :prompt => "Choose a reason" %> diff --git a/app/views/request/_sidebar.html.erb b/app/views/request/_sidebar.html.erb index 03185c44b..302172555 100644 --- a/app/views/request/_sidebar.html.erb +++ b/app/views/request/_sidebar.html.erb @@ -25,7 +25,7 @@ <% else %> <p><%= _('Requests for personal information and vexatious requests are not considered valid for FOI purposes (<a href="/help/about">read more</a>).') %></p> <p><%= _('If you believe this request is not suitable, you can report it for attention by the site administrators') %></p> - <%= link_to _("Report this request"), new_request_report_path(:url_title => @info_request.url_title) %> + <%= link_to _("Report this request"), new_request_report_path(:request_id => @info_request.url_title) %> <% end %> <% end %> <h2><%= _("Act on what you've learnt") %></h2> diff --git a/config/routes.rb b/config/routes.rb index 0d36cbf82..a8a43cd82 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -60,8 +60,8 @@ Alaveteli::Application.routes.draw do match '/request/:url_title/download' => 'request#download_entire_request', :as => :download_entire_request #### - match '/request/:url_title/report' => 'reports#create', :as => :request_report, :via => :post - match '/request/:url_title/report/new' => 'reports#new', :as => :new_request_report + match '/request/:request_id/report' => 'reports#create', :as => :request_report, :via => :post + match '/request/:request_id/report/new' => 'reports#new', :as => :new_request_report #### User controller # Use /profile for things to do with the currently signed in user. diff --git a/spec/controllers/reports_controller_spec.rb b/spec/controllers/reports_controller_spec.rb index 61e35c065..45ee5ceba 100644 --- a/spec/controllers/reports_controller_spec.rb +++ b/spec/controllers/reports_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe ReportsController, "when reporting a request when not logged in" do it "should only allow logged-in users to report requests" do - post :create, :url_title => info_requests(:badger_request).url_title + post :create, :request_id => info_requests(:badger_request).url_title flash[:notice].should =~ /You need to be logged in/ response.should redirect_to show_request_path(:url_title => info_requests(:badger_request).url_title) @@ -19,7 +19,7 @@ describe ReportsController, "when reporting a request (logged in)" do it "should 404 for non-existent requests" do lambda { - post :create, :url_title => "hjksfdhjk_louytu_qqxxx" + post :create, :request_id => "hjksfdhjk_louytu_qqxxx" }.should raise_error(ActiveRecord::RecordNotFound) end @@ -28,7 +28,7 @@ describe ReportsController, "when reporting a request (logged in)" do title = ir.url_title ir.attention_requested.should == false - post :create, :url_title => title + post :create, :request_id => title response.should redirect_to show_request_path(:url_title => title) ir.reload @@ -40,16 +40,16 @@ describe ReportsController, "when reporting a request (logged in)" do info_request = mock_model(InfoRequest, :url_title => "foo", :attention_requested= => nil, :save! => nil) InfoRequest.should_receive(:find_by_url_title!).with("foo").and_return(info_request) info_request.should_receive(:report!).with("Not valid request", "It's just not", @user) - post :create, :url_title => "foo", :reason => "Not valid request", :message => "It's just not" + post :create, :request_id => "foo", :reason => "Not valid request", :message => "It's just not" end it "should not allow a request to be reported twice" do title = info_requests(:badger_request).url_title - post :create, :url_title => title + post :create, :request_id => title response.should redirect_to show_request_url(:url_title => title) - post :create, :url_title => title + post :create, :request_id => title response.should redirect_to show_request_url(:url_title => title) flash[:notice].should =~ /has already been reported/ end @@ -57,7 +57,7 @@ describe ReportsController, "when reporting a request (logged in)" do it "should send an email from the reporter to admins" do ir = info_requests(:badger_request) title = ir.url_title - post :create, :url_title => title + post :create, :request_id => title deliveries = ActionMailer::Base.deliveries deliveries.size.should == 1 mail = deliveries[0] @@ -75,7 +75,7 @@ describe ReportsController, "#new_report_request" do context "not logged in" do it "should require the user to be logged in" do - get :new, :url_title => "foo" + get :new, :request_id => "foo" response.should_not render_template("new") end end @@ -85,7 +85,7 @@ describe ReportsController, "#new_report_request" do session[:user_id] = users(:bob_smith_user).id end it "should show the form" do - get :new, :url_title => "foo" + get :new, :request_id => "foo" response.should render_template("new") end end |