diff -r d1a89d165045 -r 306fe72bfd07 entities/lib.py --- a/entities/lib.py Thu Aug 13 13:05:50 2009 +0200 +++ b/entities/lib.py Thu Aug 13 13:06:10 2009 +0200 @@ -84,9 +84,24 @@ return super(EmailAddress, self).after_deletion_path() -from logilab.common.deprecation import class_renamed -Emailaddress = class_renamed('Emailaddress', EmailAddress) -Emailaddress.id = 'Emailaddress' +class Bookmark(AnyEntity): + """customized class for Bookmark entities""" + id = 'Bookmark' + fetch_attrs, fetch_order = fetch_config(['title', 'path']) + + def actual_url(self): + url = self.req.build_url(self.path) + if self.title: + urlparts = list(urlsplit(url)) + if urlparts[3]: + urlparts[3] += '&vtitle=%s' % self.req.url_quote(self.title) + else: + urlparts[3] = 'vtitle=%s' % self.req.url_quote(self.title) + url = urlunsplit(urlparts) + return url + + def action_url(self): + return self.absolute_url() + '/follow' class CWProperty(AnyEntity): @@ -111,26 +126,6 @@ return 'view', {} -class Bookmark(AnyEntity): - """customized class for Bookmark entities""" - id = 'Bookmark' - fetch_attrs, fetch_order = fetch_config(['title', 'path']) - - def actual_url(self): - url = self.req.build_url(self.path) - if self.title: - urlparts = list(urlsplit(url)) - if urlparts[3]: - urlparts[3] += '&vtitle=%s' % self.req.url_quote(self.title) - else: - urlparts[3] = 'vtitle=%s' % self.req.url_quote(self.title) - url = urlunsplit(urlparts) - return url - - def action_url(self): - return self.absolute_url() + '/follow' - - class CWCache(AnyEntity): """Cache""" id = 'CWCache'