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

Follow up fix for issue #1290 - Missing replacement of Config and Current User objects in text modules and signatures.

Browse source
This commit is contained in:
Martin Edenhofer 2017-08-14 17:27:33 +02:00
parent 9026362d7a
commit 279478025e
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,7 +228,7 @@ class App.TicketCreate extends App.Controller
type = @$('[name="formSenderType"]').val() type = @$('[name="formSenderType"]').val()
if signature isnt undefined && signature.body && type is 'email-out' if signature isnt undefined && signature.body && type is 'email-out'
signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get() }) signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get(), config: App.Config.all() })
body = @$('[data-name=body]') body = @$('[data-name=body]')
if App.Utils.signatureCheck(body.html() || '', signatureFinished) if App.Utils.signatureCheck(body.html() || '', signatureFinished)

2
app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
View file

@ -525,7 +525,7 @@ class App.TicketZoomArticleNew extends App.Controller
@$('[data-name=body] [data-signature="true"]').remove() @$('[data-name=body] [data-signature="true"]').remove()
# apply new signature # apply new signature
signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get(), ticket: ticketCurrent }) signatureFinished = App.Utils.replaceTags(signature.body, { user: App.Session.get(), ticket: ticketCurrent, config: App.Config.all() })
body = @$('[data-name=body]') body = @$('[data-name=body]')
if App.Utils.signatureCheck(body.html() || '', signatureFinished) if App.Utils.signatureCheck(body.html() || '', signatureFinished)

1
app/assets/javascripts/app/lib/app_post/utils.coffee
View file

@ -126,6 +126,7 @@ class App.Utils
# htmlEscapedAndPhoneified = App.Utils.phoneify(rawText) # htmlEscapedAndPhoneified = App.Utils.phoneify(rawText)
@phoneify: (string) -> @phoneify: (string) ->
return string if _.isEmpty(string)
string = string.replace(/[^0-9,\+,#,\*]+/g, '') string = string.replace(/[^0-9,\+,#,\*]+/g, '')
.replace(/(.)\+/, '$1') .replace(/(.)\+/, '$1')
"tel:#{string}" "tel:#{string}"