-
Notifications
You must be signed in to change notification settings - Fork 729
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #5173 - Many new tickets for one customer leads to massive requ…
…ests to ticket_customer endpoint. Co-authored-by: Mantas Masalskis <mm@zammad.com> Co-authored-by: Dusan Vuckovic <dv@zammad.com>
- Loading branch information
1 parent
acd8826
commit 4b860eb
Showing
5 changed files
with
54 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
app/assets/javascripts/app/lib/app_post/popover_provider/_popover_provider_ajax.coffee
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
class App.PopoverProviderAjax extends App.PopoverProvider | ||
onHide: (event, elem) -> | ||
$(event.target).attr('data-content', App.view('generic/page_loading')()).data('bs.popover').setContent() | ||
|
||
onShow: (event, elem) -> | ||
if @popoverLoop | ||
@popoverLoop = false | ||
return | ||
|
||
@fetch(event, elem) | ||
|
||
fetch: (event, elem) -> | ||
|
||
replaceOnShow: (event, content) -> | ||
$(event.target).popover('hide') | ||
$(event.target).attr('data-content', content).data('bs.popover').setContent() | ||
@popoverLoop = true | ||
$(event.target).popover('show') | ||
|
||
buildTitleFor: (elem) -> | ||
$(elem).find('[title="*"]').val() | ||
|
||
buildContentFor: (elem, supplementaryData) -> | ||
App.view('generic/page_loading')() |
36 changes: 19 additions & 17 deletions
36
app/assets/javascripts/app/lib/app_post/popover_provider/user_ticket_popover_provider.coffee
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,39 @@ | ||
class App.UserTicketPopoverProvider extends App.PopoverProvider | ||
class UserTicket extends App.PopoverProviderAjax | ||
@templateName = 'user_ticket_list' | ||
|
||
fetch: (buildParams) -> | ||
fetch: (event, elem) -> | ||
@params.parentController.ajax( | ||
type: 'GET' | ||
url: "#{App.Config.get('api_path')}/ticket_customer" | ||
data: | ||
customer_id: buildParams.user_id | ||
customer_id: @buildParams.user_id | ||
processData: true | ||
success: (data, status, xhr) => | ||
App.Collection.loadAssets(data.assets) | ||
|
||
ticketsList = { open: data.ticket_ids_open, closed: data.ticket_ids_closed } | ||
@callback(ticketsList: ticketsList, selector: buildParams.selector) | ||
ticketList = { open: data.ticket_ids_open, closed: data.ticket_ids_closed } | ||
html = @buildContentFor(elem, { ticketList: ticketList, selector: @buildParams.selector }) | ||
|
||
@replaceOnShow(event, html[0].outerHTML) | ||
) | ||
|
||
build: (buildParams) -> | ||
return if !@checkPermissions() | ||
@fetch(buildParams) | ||
|
||
callback: (supplementaryData) -> | ||
@clear(@popovers) | ||
@popovers = @buildPopovers(supplementaryData) | ||
|
||
buildTitleFor: (elem) -> | ||
$(elem).find('[title="*"]').val() | ||
@buildParams = buildParams | ||
@popovers = @buildPopovers(ticketList: {}, selector: buildParams.selector) | ||
|
||
buildContentFor: (elem, supplementaryData) -> | ||
return super if _.isEmpty(supplementaryData.ticketList) | ||
|
||
type = $(elem).filter('[data-type]').data('type') | ||
ticket_ids = supplementaryData.ticketsList[type] || [] | ||
ticket_ids = supplementaryData.ticketList[type] || [] | ||
|
||
tickets = ticket_ids.map (ticketId) -> App.Ticket.fullLocal(ticketId) | ||
@buildHtmlContent( | ||
ticketList: App.view('generic/ticket_list')( | ||
tickets: tickets | ||
show_id: true | ||
) | ||
) | ||
|
||
# insert data | ||
@buildHtmlContent(tickets: tickets) | ||
|
||
App.PopoverProvider.registerProvider('UserTicket', UserTicket) |
42 changes: 0 additions & 42 deletions
42
app/assets/javascripts/app/lib/app_post/user_ticket_popover_provider.coffee
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters