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

Fixed multiple attachment on d&d bug in zoom.

Browse source
This commit is contained in:
Martin Edenhofer 2015-11-04 10:30:30 +01:00
parent 21de1e8bd8
commit 58b90fd489
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,6 +137,7 @@ class App.TicketZoomArticleNew extends App.Controller
ticket: ticket ticket: ticket
articleTypes: @articleTypes articleTypes: @articleTypes
article: @defaults article: @defaults
form_id: @form_id
isCustomer: @isRole('Customer') isCustomer: @isRole('Customer')
) )
@setArticleType(@type) @setArticleType(@type)
@ -167,7 +168,7 @@ class App.TicketZoomArticleNew extends App.Controller
html5Upload.initialize( html5Upload.initialize(
uploadUrl: App.Config.get('api_path') + '/ticket_attachment_upload', uploadUrl: App.Config.get('api_path') + '/ticket_attachment_upload',
dropContainer: @el.get(0), dropContainer: @$('.article-add').get(0),
cancelContainer: @cancelContainer, cancelContainer: @cancelContainer,
inputField: @$('.article-attachment input').get(0), inputField: @$('.article-attachment input').get(0),
key: 'File', key: 'File',

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

@ -1,7 +1,7 @@
<form class="article-add <% if @article.internal: %>is-internal<% else: %>is-public<% end %>" data-type="<%= @article.type %>"> <form class="article-add <% if @article.internal: %>is-internal<% else: %>is-public<% end %>" data-type="<%= @article.type %>">
<input type="hidden" name="type" value="<%= @article.type %>"> <input type="hidden" name="type" value="<%= @article.type %>">
<input type="hidden" name="internal" value="<%= @article.internal %>"> <input type="hidden" name="internal" value="<%= @article.internal %>">
<input type="hidden" name="form_id" value="<%= @article.form_id %>"> <input type="hidden" name="form_id" value="<%= @form_id %>">
<input type="hidden" name="in_reply_to" value="<%= @article.in_reply_to %>"> <input type="hidden" name="in_reply_to" value="<%= @article.in_reply_to %>">
<div class="editControls"> <div class="editControls">
<div class="js-avatar"></div> <div class="js-avatar"></div>