From 0794af75e74d4b84a0771ad404e876f79488fe0b Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sat, 7 Jul 2012 08:39:59 +0200
Subject: [PATCH] Added missing merge template.

---
 .../controllers/agent_ticket_merge.js.coffee  |  1 -
 .../app/views/agent_ticket_merge.jst.eco      | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/app/views/agent_ticket_merge.jst.eco

diff --git a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
index b08495c3c..37d104179 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
@@ -8,7 +8,6 @@ class App.TicketMerge extends App.ControllerModal
 #      head: 'New User',
 #      form: @formGen( model: App.User, required: 'quick' ),
     )
-    @log '123123123'
     @modalShow()
 
   submit: (e) =>
diff --git a/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco b/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco
new file mode 100644
index 000000000..2ecf84c36
--- /dev/null
+++ b/app/assets/javascripts/app/views/agent_ticket_merge.jst.eco
@@ -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>
\ No newline at end of file