Changeset 3880

Timestamp:

06/21/08 11:08:28 (4 months ago)

Author:

athomas

Message:

Reimplement descriptions for tagged objects. Fixes #2749.

Note: This is a tag provider API change.

Files:

• tagsplugin/trunk/tractags/api.py (modified) (3 diffs)
• tagsplugin/trunk/tractags/macros.py (modified) (3 diffs)
• tagsplugin/trunk/tractags/ticket.py (modified) (1 diff)
• tagsplugin/trunk/tractags/wiki.py (modified) (3 diffs)

tagsplugin/trunk/tractags/api.py

@@ -48 +48 @@
-        """Remove all tags from a resource."""
-
+    def describe_tagged_resource(resource):
+        """Return a one line description of the tagged resource."""
+
-
-class DefaultTagProvider(Component):
@@ -154 +157 @@
-            raise
-
+    def describe_tagged_resource(self, resource):
+        return ''
+
-
-class TagSystem(Component):
@@ -235 +241 @@
-        return set([t.strip() for t in self._tag_split.split(text) if t.strip()])
-
+    def describe_tagged_resource(self, resource):
+        """Return a short description of a taggable resource."""
+        provider = self._get_provider(resource.realm)
+        if hasattr(provider, 'describe_tagged_resource'):
+            return provider.describe_tagged_resource(resource)
+        else:
+            return ''
+
-    # IPermissionRequestor methods
-    def get_permission_actions(self):

tagsplugin/trunk/tractags/macros.py

@@ -73 +73 @@
-    def expand_macro(self, formatter, name, content):
-        req = formatter.req
-
+
+
-        add_stylesheet(req, 'tags/css/tractags.css')
-
@@ -84 +85 @@
-                                     key=lambda r: unicode(r[0].id)):
-            tags = sorted(tags)
+
+            desc = tag_system.describe_tagged_resource(resource)
+
-            if tags:
-                rendered_tags = [
@@ -89 +93 @@
-                    for tag in tags
-                    ]
-
+', desc, ' 
-                                [(' ', tag) for tag in rendered_tags[1:]],
-                                ')')
-            else:
-
+, ' ', desc
-            ul(li, '\n')
-        return ul

tagsplugin/trunk/tractags/ticket.py

@@ -98 +98 @@
-        ticket.save_changes(req.username, u'')
-
+    def describe_tagged_resource(self, resource):
+        assert resource.realm == 'ticket'
+        ticket = Ticket(self.env, resource.id)
+        if ticket.exists:
+            return '%s (%s)' % (ticket['summary'], ticket['status'])
+        else:
+            return ''
+
-    # Private methods
-    def _ticket_tags(self, ticket):

tagsplugin/trunk/tractags/wiki.py

@@ -7 +7 @@
-#
-
+import re
-from trac.core import *
-from tractags.api import DefaultTagProvider, TagSystem
@@ -15 +16 @@
-from trac.web.api import ITemplateStreamFilter
-from trac.wiki.api import IWikiPageManipulator, IWikiChangeListener
+from trac.wiki.model import WikiPage
-from trac.util.compat import sorted
-from genshi.builder import tag
@@ -24 +26 @@
-    realm = 'wiki'
-
+    first_head = re.compile('=\s+([^=]*)=') 
+
-    def check_permission(self, perm, operation):
-        map = {'view': 'WIKI_VIEW', 'modify': 'WIKI_MODIFY'}
-        return super(WikiTagProvider, self).check_permission(perm, operation) \
-            and map[operation] in perm
+
+    def describe_tagged_resource(self, resource):
+        assert resource.realm == 'wiki'
+        page = WikiPage(self.env, resource.id)
+        if page.exists:
+            ret = self.first_head.search(page.text)
+            return ret and ret.group(1) or ''
+        return ''
-
-