You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/01/29 21:00:28 UTC
[6/6] git commit: [#2584] ticket:256 Simplified ticket's visibility
condition
Updated Branches:
refs/heads/master 639ef8e3d -> f0e64e33d
[#2584] ticket:256 Simplified ticket's visibility condition
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4efbbb8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4efbbb8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4efbbb8b
Branch: refs/heads/master
Commit: 4efbbb8bdc64e0317b8b68d97ae0f62df70457ae
Parents: 6c4ae59
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon Jan 21 16:26:59 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Jan 29 19:59:49 2013 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/tracker_main.py | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4efbbb8b/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 7324598..4ff853b 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -1100,13 +1100,8 @@ class TicketController(BaseController):
page=validators.Int(if_empty=0),
limit=validators.Int(if_empty=10)))
def index(self, page=0, limit=10, deleted=False, **kw):
- ticket_visible = False
- if self.ticket is not None:
- ticket_visible = (not self.ticket.deleted or
- (self.ticket.deleted and
- has_access(self.ticket,'delete')))
-
- if ticket_visible:
+ ticket_visible = self.ticket and not self.ticket.deleted
+ if ticket_visible or has_access(self.ticket, 'delete'):
c.ticket_form = W.ticket_form
c.thread = W.thread
c.attachment_list = W.attachment_list