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

Merge branch 'private-issue437' into develop

Browse source
This commit is contained in:
Martin Edenhofer 2016-11-21 08:49:35 +01:00
commit 25eaae05e3
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,7 @@ class App.TicketZoomArticleNew extends App.Controller
possibleArticleType['email'] = true possibleArticleType['email'] = true
# gets referenced in @setArticleType # gets referenced in @setArticleType
@internalSelector = true
@type = @defaults['type'] || 'note' @type = @defaults['type'] || 'note'
@articleTypes = [] @articleTypes = []
if possibleArticleType.note if possibleArticleType.note
@ -115,6 +116,9 @@ class App.TicketZoomArticleNew extends App.Controller
}, },
] ]
if @permissionCheck('ticket.customer')
@internalSelector = false
@textareaHeight = @textareaHeight =
open: 148 open: 148
closed: 20 closed: 20
@ -194,11 +198,12 @@ class App.TicketZoomArticleNew extends App.Controller
ticket = App.Ticket.fullLocal(@ticket_id) ticket = App.Ticket.fullLocal(@ticket_id)
@html App.view('ticket_zoom/article_new')( @html App.view('ticket_zoom/article_new')(
ticket: ticket ticket: ticket
articleTypes: @articleTypes articleTypes: @articleTypes
article: @defaults article: @defaults
form_id: @form_id form_id: @form_id
isCustomer: @permissionCheck('ticket.customer') isCustomer: @permissionCheck('ticket.customer')
internalSelector: @internalSelector
) )
@setArticleType(@type) @setArticleType(@type)

2
app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
View file

@ -21,6 +21,7 @@
<% end %> <% end %>
</div> </div>
</div> </div>
<% if @internalSelector: %>
<div class="editControls-item is-hidden js-toggleVisibility js-selectInternalPublic"> <div class="editControls-item is-hidden js-toggleVisibility js-selectInternalPublic">
<div class="editControls-iconHolder"> <div class="editControls-iconHolder">
<div class="editControls-icon icon-internal" title="<%- @Ti("set to public") %>"> <div class="editControls-icon icon-internal" title="<%- @Ti("set to public") %>">
@ -31,6 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
<% end %>
</div> </div>
<div class="article-content bubble-gap"> <div class="article-content bubble-gap">
<div class="internal-border"> <div class="internal-border">