From 45d7c5505fb8857b03e93ba3ececf003792c781c Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Sat, 26 May 2012 20:59:14 -0700 Subject: [PATCH] Do not show Tickets in the schedule screen when they are either in the Trash or in the Clipboard. Fixes bug #12345. --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/EventManagementSystem.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index e0fb96ac1..5445a2186 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -15,6 +15,7 @@ - fixed #12349: Friends invitation error - fixed #12353: Dataform List mode - fixed #12364: Site export loses session info + - fixed #12345: tickets in trash still show up 7.10.24 - fixed #12318: asset error causes asset manager to fail diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index cd82c8d6f..0abfdd874 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -1792,6 +1792,7 @@ sub www_getScheduleDataJSON { and EMSTicket.location in ( } . join( ',', (map { $db->quote($_) } (@ticketLocations))) . q{ ) + and asset.state='published' and assetData.revisionDate = ( select max(revisionDate) from assetData