From bbfbe036d6a0d738bcb53d44abc6849d4391f473 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 7 Oct 2014 20:35:30 +0200 Subject: [PATCH] Replace while form-group, not only form-group control. --- .../javascripts/app/controllers/agent_ticket_create.js.coffee | 3 +-- .../app/controllers/customer_ticket_create.js.coffee | 3 +-- app/assets/javascripts/app/controllers/ticket_zoom.js.coffee | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 85465afc5..0416cf0a1 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -210,7 +210,6 @@ class App.TicketCreate extends App.Controller # find element to replace for item in attributes if item.name is fieldNameToChange - item.display = false item['filter'] = {} item['filter'][ fieldNameToChange ] = filter item.default = params[item.name] @@ -219,7 +218,7 @@ class App.TicketCreate extends App.Controller newElement = ui.formGenItem( item, classname, form ) # replace new option list - form.find('[name="' + fieldNameToChange + '"]').replaceWith( newElement ) + form.find('[name="' + fieldNameToChange + '"]').closest('.form-group').replaceWith( newElement ) new App.ControllerForm( el: @el.find('.ticket-form-top') diff --git a/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee index 22979bda2..e658dcacc 100644 --- a/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/customer_ticket_create.js.coffee @@ -77,7 +77,6 @@ class Index extends App.ControllerContent # find element to replace for item in attributes if item.name is fieldNameToChange - item.display = false item['filter'] = {} item['filter'][ fieldNameToChange ] = filter item.default = params[item.name] @@ -86,7 +85,7 @@ class Index extends App.ControllerContent newElement = ui.formGenItem( item, classname, form ) # replace new option list - form.find('[name="' + fieldNameToChange + '"]').replaceWith( newElement ) + form.find('[name="' + fieldNameToChange + '"]').closest('.form-group').replaceWith( newElement ) @html App.view('customer_ticket_create')( head: 'New Ticket' ) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index 0f33d74b1..badeaac07 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -202,7 +202,6 @@ class App.TicketZoom extends App.Controller # find element to replace for item in attributes if item.name is fieldNameToChange - item.display = false item['filter'] = {} item['filter'][ fieldNameToChange ] = filter item.default = params[item.name] @@ -211,7 +210,7 @@ class App.TicketZoom extends App.Controller newElement = ui.formGenItem( item, classname, form ) # replace new option list - form.find('[name="' + fieldNameToChange + '"]').replaceWith( newElement ) + form.find('[name="' + fieldNameToChange + '"]').closest('.form-group').replaceWith( newElement ) defaults = ticket.attributes() task_state = @taskGet('ticket')