diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 047e88eb1..3833ca7dc 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -37,6 +37,7 @@ - fixed #10970: Newsletter Asset: no subscribe link - fixed #10953: SendNewsletters Activity: Invalid template variable - fixed #10913: User profiles: Impossible to delete field contents + - fixed #10929: EMS Ticket Start Date Sort 7.7.19 - fixed #10838: Forwarded forum post email to new CS adds reply to original thread diff --git a/docs/upgrades/packages-7.8.0/root_import_ems_badge-builder-default.wgpkg b/docs/upgrades/packages-7.8.0/root_import_ems_badge-builder-default.wgpkg new file mode 100644 index 000000000..f3ca35b11 Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_ems_badge-builder-default.wgpkg differ diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index 4241b0d19..b7ae690ad 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -1261,11 +1261,13 @@ sub www_getTicketsAsJson { my ($self) = @_; my $session = $self->session; return $session->privilege->insufficient() unless $self->canView; - my ($db, $form) = $session->quick(qw(db form)); - my $startIndex = $form->get('startIndex') || 0; - my $numberOfResults = $form->get('results') || 25; + my ($db, $form) = $session->quick(qw(db form)); + my $startIndex = $form->get('startIndex') || 0; + my $numberOfResults = $form->get('results') || 25; + my $sortDir = $form->get('sortDir') || 'ASC'; + my $sortKey = $form->get('sortKey') || 'eventNumber'; my %results = (); - my @ids = (); + my @ids = (); my $keywords = $form->get('keywords'); # looking for specific events @@ -1287,7 +1289,7 @@ sub www_getTicketsAsJson { # just get all tickets else { @ids = $db->buildArray("select assetId from asset left join EMSTicket using (assetId) where parentId=? and -className='WebGUI::Asset::Sku::EMSTicket' and state='published' and revisionDate=(select max(revisionDate) from EMSTicket where assetId=asset.assetId) order by eventNumber", [$self->getId]); +className='WebGUI::Asset::Sku::EMSTicket' and state='published' and revisionDate=(select max(revisionDate) from EMSTicket where assetId=asset.assetId) order by $sortKey $sortDir", [$self->getId]); } # get badge's badge groups