From 11398f857339b95936ee98ea6e8f368877327482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= Date: Wed, 21 Oct 2015 11:49:51 +0200 Subject: [PATCH] [webui] Fix NoMethodError for /home/requests page (issue #1261) NoMethodError: undefined method `to_sym' for nil:NilClass --- src/api/app/controllers/webui/user_controller.rb | 2 +- src/api/test/functional/webui/request_controller_test.rb | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/api/app/controllers/webui/user_controller.rb b/src/api/app/controllers/webui/user_controller.rb index 15cc7680b93..b6d9925c6b0 100644 --- a/src/api/app/controllers/webui/user_controller.rb +++ b/src/api/app/controllers/webui/user_controller.rb @@ -92,7 +92,7 @@ def requests } sorting_field = sortable_fields[params[:iSortCol_0].to_i] sorting_field ||= :created_at - sorting_dir = params[:sSortDir_0].to_sym + sorting_dir = params[:sSortDir_0].try(:to_sym) sorting_dir = :asc unless ["asc", "desc"].include?(params[:sSortDir_0]) @requests = @displayed_user.requests(params[:sSearch]) @requests_count = @requests.clone.count diff --git a/src/api/test/functional/webui/request_controller_test.rb b/src/api/test/functional/webui/request_controller_test.rb index 09a751fe30f..eb140fb6614 100644 --- a/src/api/test/functional/webui/request_controller_test.rb +++ b/src/api/test/functional/webui/request_controller_test.rb @@ -273,6 +273,15 @@ def test_requests_display_as_king visit_requests end + def test_requests + get "/home/requests.json" + assert_response :success + result = ActiveSupport::JSON.decode(@response.body) + assert_equal 2, result["sEcho"] + assert_equal 0, result["iTotalRecords"] + assert_equal [], result["aaData"] + end + def test_succesful_comment_creation login_Iggy to: request_show_path(1) fill_in 'body', with: 'Comment Body'