From 4af0a468bbf761d6d4396639178d9815c5df0367 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 30 Oct 2014 10:59:55 +0100 Subject: [PATCH] fix modal in generic controller like in manage/organizations --- .../_application_controller_generic.js.coffee | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee index 0b1f42b05..e72974dbd 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee @@ -12,7 +12,8 @@ class App.ControllerGenericNew extends App.ControllerModal screen: @screen || 'edit' autofocus: true ) - @el = controller.form + + @content = controller.form @show() @@ -62,7 +63,7 @@ class App.ControllerGenericEdit extends App.ControllerModal screen: @screen || 'edit' autofocus: true ) - @el = controller.form + @content = controller.form @show() @@ -363,13 +364,13 @@ class App.GenericHistory extends App.ControllerModal localItem = @reworkItems( @items ) - @html App.view('generic/history')( + @content = $ App.view('generic/history')( items: localItem ) @onShow() - @el.find('a[data-type="sortorder"]').bind( + @content.find('a[data-type="sortorder"]').bind( 'click', (e) => e.preventDefault()