From 84f5447b99aeaecb356eee140349f50715d78841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 31 Aug 2015 12:53:16 +0200 Subject: [PATCH] Bug #3894: Support returns an error message with ruby 1.8 --- src/sunstone/routes/support.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/sunstone/routes/support.rb b/src/sunstone/routes/support.rb index cf5515a3a0..aa9e60ef1e 100644 --- a/src/sunstone/routes/support.rb +++ b/src/sunstone/routes/support.rb @@ -14,6 +14,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +UNSUPPORTED_RUBY = (RUBY_VERSION =~ /^1.8/) != nil + begin require 'zendesk_api' rescue LoadError @@ -72,7 +74,7 @@ helpers do def zrequest_to_one(zrequest) one_zrequest = { - "id" => zrequest.id, ### TODO: .id in 1.8.7 fails!! + "id" => zrequest.id, "url" => zrequest.url, "subject" => zrequest.subject, "description" => zrequest.description, @@ -83,7 +85,7 @@ helpers do } zrequest.custom_fields.each { |field| - case field.id ### TODO: .id in 1.8.7 fails!! + case field.id when 391130 one_zrequest["opennebula_version"] = field.value when 391197 @@ -109,6 +111,10 @@ helpers do end def check_zendesk_api_gem + if UNSUPPORTED_RUBY + error 500, "Ruby version >= 1.9 is required" + end + if !ZENDESK_API_GEM error 500, "zendesk_api gem missing" end