Changeset 2201

Timestamp:

04/26/07 16:37:21 (2 years ago)

Author:

coderanger

Message:

PrivateTicketsPlugin:

Fix up the access controls for the query module, and fix its button. (closes #1471)

Files:

• privateticketsplugin/0.10/privatetickets/view.py (modified) (3 diffs)

privateticketsplugin/0.10/privatetickets/view.py

@@ -27 +27 @@
-        
-        # Various ways to allow access
-
+
+
+
+
+
+
+
-            if TicketModule(self.env).match_request(req):
-                if PrivateTicketsSystem(self.env).check_ticket_access(req, req.args['id']):
@@ -37 +43 @@
-                req.args['DO_PRIVATETICKETS_FILTER'] = 'query'
-                self._grant_view(req) # Further filtering in query.py
-                # NOTE: Send this back here because the button would be hidden otherwise. <NPK t:1129>
-                return [('mainnav', 'tickets',
-                         html.A('View Tickets', href=req.href.query()))]
-            elif SearchModule(self.env).match_request(req):
-                if 'ticket' in req.args.keys():
@@ -48 +51 @@
-                if req.args.get('id'):
-                    req.args['DO_PRIVATETICKETS_FILTER'] = 'report'
+                    
+            # NOTE: Send this back here because the button would be hidden otherwise. <NPK t:1129>
+            if not self.env.is_component_enabled(ReportModule) or not req.perm.has_permission('REPORT_VIEW'):
+                return [('mainnav', 'tickets',
+                        html.A('View Tickets', href=req.href.query()))]
+
-        return []
-