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

Added missing merge template.

Browse source
This commit is contained in:
Martin Edenhofer 2012-07-07 08:39:59 +02:00
parent 62733c0f58
commit 0794af75e7
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
View file

@ -8,7 +8,6 @@ class App.TicketMerge extends App.ControllerModal
# head: 'New User', # head: 'New User',
# form: @formGen( model: App.User, required: 'quick' ), # form: @formGen( model: App.User, required: 'quick' ),
) )
@log '123123123'
@modalShow() @modalShow()
submit: (e) => submit: (e) =>

21
app/assets/javascripts/app/views/agent_ticket_merge.jst.eco Normal file
View file

@ -0,0 +1,21 @@
<form class="form-horizontal">
<div class="modal-header">
<a href="#" class="close">&times;</a>
<h3><%- T('Merge') %></h3>
</div>
<div class="modal-body">
<div class="table_history"></div>
<%- T('Merge to Ticket#') %>:
<input type="text" name="master_ticket_number" value=""/>
<!--
<ul>
<li>Ticket#</li>
<li>Recent Views Tickets</li>
<li>Recent Customer Tickets</li>
</ul>
-->
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary"><%- T('Submit') %></button>
</div>
</form>