oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sorting in the EMS ticket screen. bug #10929.

Browse source
This commit is contained in:
Colin Kuskie 2009-09-15 10:24:19 -07:00
parent 082b04b967
commit 740066cebc
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -37,6 +37,7 @@
- fixed #10970: Newsletter Asset: no subscribe link - fixed #10970: Newsletter Asset: no subscribe link
- fixed #10953: SendNewsletters Activity: Invalid template variable - fixed #10953: SendNewsletters Activity: Invalid template variable
- fixed #10913: User profiles: Impossible to delete field contents - fixed #10913: User profiles: Impossible to delete field contents
- fixed #10929: EMS Ticket Start Date Sort
7.7.19 7.7.19
- fixed #10838: Forwarded forum post email to new CS adds reply to original thread - fixed #10838: Forwarded forum post email to new CS adds reply to original thread

BIN
docs/upgrades/packages-7.8.0/root_import_ems_badge-builder-default.wgpkg Normal file
View file

Binary file not shown.

12
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -1261,11 +1261,13 @@ sub www_getTicketsAsJson {
my ($self) = @_; my ($self) = @_;
my $session = $self->session; my $session = $self->session;
return $session->privilege->insufficient() unless $self->canView; return $session->privilege->insufficient() unless $self->canView;
my ($db, $form) = $session->quick(qw(db form)); my ($db, $form) = $session->quick(qw(db form));
my $startIndex = $form->get('startIndex') || 0; my $startIndex = $form->get('startIndex') || 0;
my $numberOfResults = $form->get('results') || 25; my $numberOfResults = $form->get('results') || 25;
my $sortDir = $form->get('sortDir') || 'ASC';
my $sortKey = $form->get('sortKey') || 'eventNumber';
my %results = (); my %results = ();
my @ids = (); my @ids = ();
my $keywords = $form->get('keywords'); my $keywords = $form->get('keywords');
# looking for specific events # looking for specific events
@ -1287,7 +1289,7 @@ sub www_getTicketsAsJson {
# just get all tickets # just get all tickets
else { else {
@ids = $db->buildArray("select assetId from asset left join EMSTicket using (assetId) where parentId=? and @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 # get badge's badge groups