From 740066cebc2564f518d251e2b9632d331ea20b64 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 15 Sep 2009 10:24:19 -0700 Subject: [PATCH] Fix sorting in the EMS ticket screen. bug #10929. --- docs/changelog/7.x.x.txt | 1 + .../root_import_ems_badge-builder-default.wgpkg | Bin 0 -> 8636 bytes .../Asset/Wobject/EventManagementSystem.pm | 12 +++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 docs/upgrades/packages-7.8.0/root_import_ems_badge-builder-default.wgpkg 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 0000000000000000000000000000000000000000..f3ca35b118e8e5b9ba02b93c3aaff7b676f3920a GIT binary patch literal 8636 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 O3j8l42gVx!q5uGF`m0d@ literal 0 HcmV?d00001 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