diff --git a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee index 8b173acdc..45398b4df 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee @@ -75,8 +75,8 @@ class App.ControllerTable extends App.Controller dataTypesForCols = [] for row in overview dataTypesForCols.push { - name: row, - link: true, + name: row + link: true } # extended table format @@ -111,11 +111,12 @@ class App.ControllerTable extends App.Controller @log 'table', 'header', header, 'overview', dataTypesForCols, 'objects', data.objects table = App.view('generic/table')( - header: header, - overview: dataTypesForCols, - objects: data.objects, - checkbox: data.checkbox, - radio: data.radio, + header: header + overview: dataTypesForCols + objects: data.objects + checkbox: data.checkbox + radio: data.radio + groupBy: data.groupBy ) # convert to jquery object diff --git a/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee index e96f5c485..fa5c7432a 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee @@ -140,13 +140,17 @@ class Index extends App.Controller ) @el.find('.table-overview').append(table) else - shown_all_attributes = @ticketTableAttributes( App.Overview.find(@overview.id).view.s.overview ) + shown_all_attributes = @ticketTableAttributes( App.Overview.find( @overview.id ).view.s.overview ) new App.ControllerTable( el: @el.find('.table-overview'), overview_extended: shown_all_attributes, model: App.Ticket, objects: @ticket_list_show, checkbox: checkbox, + groupBy: + display: 'roup' + data: 'group', + data_id: 'group_id', ) # start user popups diff --git a/app/assets/javascripts/app/controllers/chat_widget.js.coffee b/app/assets/javascripts/app/controllers/chat_widget.js.coffee index f99e9c02c..66a4ec478 100644 --- a/app/assets/javascripts/app/controllers/chat_widget.js.coffee +++ b/app/assets/javascripts/app/controllers/chat_widget.js.coffee @@ -16,7 +16,7 @@ class App.ChatWidget extends App.Controller App.Event.bind 'ajax:auth', (user) => if !user @messageLog = [] - @el.html() + @el.html('') else @start() @@ -24,10 +24,10 @@ class App.ChatWidget extends App.Controller @start() start: => - @focus = false + @focus = false + @isShown = false @render() - @hide() @interval @position, 200, 'chat-widget' App.Event.bind( @@ -77,9 +77,11 @@ class App.ChatWidget extends App.Controller ) show: => + @isShown = true @el.find('#chat_content').removeClass('hide') hide: => + @isShown = false @el.find('#chat_content').addClass('hide') focusIn: => @@ -104,6 +106,10 @@ class App.ChatWidget extends App.Controller document.getElementById('chat_log_container').scrollTop = 10000 if @focus @el.find('[name=chat_message]').focus() + if @isShown + @show() + else + @hide() position: => chatHeigth = $(@el).find('div').height() @@ -115,8 +121,8 @@ class App.ChatWidget extends App.Controller scrollPositonY = window.pageYOffset scrollPositonX = window.pageXOffset - heigth = windowHeigth + scrollPositonY - chatHeigth - 10 - width = windowWidth - chatWidth - 50 + heigth = windowHeigth + scrollPositonY - chatHeigth - 15 + width = windowWidth - chatWidth - 55 @el.offset( left: width, top: heigth ) @el.css( width: '200px' ) diff --git a/app/assets/javascripts/app/views/chat_widget.jst.eco b/app/assets/javascripts/app/views/chat_widget.jst.eco index 8015cba6a..016229ca9 100644 --- a/app/assets/javascripts/app/views/chat_widget.jst.eco +++ b/app/assets/javascripts/app/views/chat_widget.jst.eco @@ -1,5 +1,5 @@