Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved url error handling.

Browse source
This commit is contained in:
Martin Edenhofer 2017-08-02 08:11:03 +02:00
parent 4eec956cbe
commit dd29b0692c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/import_zendesk.coffee
View file

@ -117,7 +117,7 @@ class Index extends App.ControllerContent
e.preventDefault() e.preventDefault()
@urlStatus.attr('data-state', '') @urlStatus.attr('data-state', '')
url = @zendeskUrl.val() + '/agent/admin/api' url = @zendeskUrl.val() + '/agent/admin/api'
@zendeskUrlApiToken.attr('href', url.replace('//', '/')) @zendeskUrlApiToken.attr('href', url.replace(/[^:]\/\//, '/'))
@zendeskUrlApiToken.val('HERE') @zendeskUrlApiToken.val('HERE')
@$('[data-slide=zendesk-url]').toggleClass('hide') @$('[data-slide=zendesk-url]').toggleClass('hide')
@$('[data-slide=zendesk-credentials]').toggleClass('hide') @$('[data-slide=zendesk-credentials]').toggleClass('hide')

2
app/controllers/import_zendesk_controller.rb
View file

@ -50,7 +50,7 @@ class ImportZendeskController < ApplicationController
end end
endpoint = "#{params[:url]}/api/v2" endpoint = "#{params[:url]}/api/v2"
endpoint.gsub('//', '/') endpoint.gsub(%r{[^:]//}, '/')
Setting.set('import_zendesk_endpoint', endpoint) Setting.set('import_zendesk_endpoint', endpoint)
render json: { render json: {