Changeset 2608

Timestamp:

09/01/07 05:18:58 (1 year ago)

Author:

athomas

Message:

Added permissions TAGS_VIEW and TAGS_MODIFY. Also using req.href() where
reasonable.

Files:

• tagsplugin/branches/0.11 (deleted)
• tagsplugin/trunk/tractags/web_ui.py (modified) (6 diffs)

tagsplugin/trunk/tractags/web_ui.py

@@ -3 +3 @@
-from StringIO import StringIO
-from trac.core import *
+from trac.perm import IPermissionRequestor
-from trac.web.main import IRequestHandler
-from trac.web.chrome import ITemplateProvider, INavigationContributor, add_stylesheet
@@ -19 +20 @@
-
-class TagsUserInterface(Component):
-
+, IPermissionRequestor
-
-    # Internal methods
@@ -66 +67 @@
-        return stream | Transformer('//div[@id="changeinfo1"]').append(insert)
-
+    # IPermissionRequestor methods
+    def get_permission_actions(self):
+        return ['TAGS_VIEW', 'TAGS_MODIFY']
+
-    # ITemplateStreamFilter methods
-    def filter_stream(self, req, method, filename, stream, data):
-
+ and 'TAGS_VIEW' in req.perm
-            return self._wiki_view(req, stream)
-
+ and 'TAGS_MODIFY' in req.perm
-            return self._wiki_edit(req, stream)
-        return stream
@@ -79 +84 @@
-
-    def validate_wiki_page(self, req, page):
-
+
+
-            self._update_tags(req, page)
-        return []
-
-#class TagsWikiModule(WikiModule):
-#    """ Replacement for the default Wiki module. Tag editing is much more
-#        intuitive now, as it no longer requires the TagIt macro and JavaScript
-#        magic. """
-#
-#    def _do_save(self, req, db, page):
-#        # This method is overridden so the user doesn't get "Page not modified"
-#        # exceptions when updating tags but not wiki content.
-#        from tractags.api import TagEngine
-#        if 'tags' in req.args:
-#            newtags = set([t.strip() for t in
-#                          _tag_split.split(req.args.get('tags')) if t.strip()])
-#            wikitags = TagEngine(self.env).tagspace.wiki
-#            oldtags = wikitags.get_tags([page.name])
-#
-#            if oldtags != newtags:
-#                wikitags.replace_tags(req, page.name, newtags)
-#                # No changes, just redirect
-#                if req.args.get('text') == page.text:
-#                    req.redirect(self.env.href.wiki(page.name))
-#                    return
-#        return WikiModule._do_save(self, req, db, page)
-#
-#    def process_request(self, req):
-#        from tractags.api import TagEngine
-#        from trac.web.chrome import add_stylesheet
-#
-#        add_stylesheet(req, 'tags/css/tractags.css')
-#
-#        pagename = req.args.get('page', 'WikiStart')
-#        action = req.args.get('action', 'view')
-#
-#        engine = TagEngine(self.env)
-#        wikitags = engine.tagspace.wiki
-#        tags = list(wikitags.get_tags([pagename]))
-#        tags.sort()
-#
-#        if action == 'edit':
-#            req.hdf['tags'] = req.args.get('tags', ', '.join(tags))
-#        elif action == 'view':
-#            hdf_tags = []
-#            for tag in tags:
-#                href, title = engine.get_tag_link(tag)
-#                hdf_tags.append({'name': tag,
-#                                 'href': href,
-#                                 'title': title})
-#            req.hdf['tags'] = hdf_tags
-#        result = WikiModule.process_request(self, req)
-#        if result is None:
-#            return None
-#        if result[0] == 'wiki.cs':
-#            return 'tagswiki.cs', None
-#        return result
-
-class TagsModule(Component):
@@ -190 +143 @@
-        from pkg_resources import resource_filename
-        return [('tags', resource_filename(__name__, 'htdocs'))]
-
+
-    # INavigationContributor methods
-    def get_active_navigation_item(self, req):
-
+
+
-
-    def get_navigation_items(self, req):
-        from trac.web.chrome import Chrome
-
-
-
+
+
+
+
-
-    # IRequestHandler methods
-    def match_request(self, req):
-
+'TAGS_VIEW' in req.perm and 
-
-    def process_request(self, req):
@@ -210 +165 @@
-        from trac.web.chrome import add_stylesheet
-
+        req.perm.require('TAGS_VIEW')
+
-        add_stylesheet(req, 'tags/css/tractags.css')
-self.env
+req
-
-        def update_from_req(args):