equal
deleted
inserted
replaced
46 return '%s <%s>' % (self.alias, self.display_address()) |
46 return '%s <%s>' % (self.alias, self.display_address()) |
47 return self.display_address() |
47 return self.display_address() |
48 |
48 |
49 @property |
49 @property |
50 def email_of(self): |
50 def email_of(self): |
51 return self.reverse_use_email and self.reverse_use_email[0] |
51 return self.reverse_use_email and self.reverse_use_email[0] or None |
52 |
52 |
53 @property |
53 @property |
54 def prefered(self): |
54 def prefered(self): |
55 return self.prefered_form and self.prefered_form[0] or self |
55 return self.prefered_form and self.prefered_form[0] or self |
56 |
56 |
57 @deprecated('use .prefered') |
57 @deprecated('[3.6] use .prefered') |
58 def canonical_form(self): |
58 def canonical_form(self): |
59 return self.prefered_form and self.prefered_form[0] or self |
59 return self.prefered_form and self.prefered_form[0] or self |
60 |
60 |
61 def related_emails(self, skipeids=None): |
61 def related_emails(self, skipeids=None): |
62 # XXX move to eemail |
62 # XXX move to eemail |
86 format='text/html'): |
86 format='text/html'): |
87 """overriden to return displayable address when necessary""" |
87 """overriden to return displayable address when necessary""" |
88 if attr == 'address': |
88 if attr == 'address': |
89 return self.display_address() |
89 return self.display_address() |
90 return super(EmailAddress, self).printable_value(attr, value, attrtype, format) |
90 return super(EmailAddress, self).printable_value(attr, value, attrtype, format) |
91 |
|
92 def after_deletion_path(self): |
|
93 """return (path, parameters) which should be used as redirect |
|
94 information when this entity is being deleted |
|
95 """ |
|
96 if self.email_of: |
|
97 return self.email_of.rest_path(), {} |
|
98 return super(EmailAddress, self).after_deletion_path() |
|
99 |
91 |
100 |
92 |
101 class Bookmark(AnyEntity): |
93 class Bookmark(AnyEntity): |
102 """customized class for Bookmark entities""" |
94 """customized class for Bookmark entities""" |
103 __regid__ = 'Bookmark' |
95 __regid__ = 'Bookmark' |
131 try: |
123 try: |
132 return self._cw._(self._cw.vreg.property_info(self.pkey)['help']) |
124 return self._cw._(self._cw.vreg.property_info(self.pkey)['help']) |
133 except UnknownProperty: |
125 except UnknownProperty: |
134 return u'' |
126 return u'' |
135 |
127 |
136 def after_deletion_path(self): |
|
137 """return (path, parameters) which should be used as redirect |
|
138 information when this entity is being deleted |
|
139 """ |
|
140 return 'view', {} |
|
141 |
|
142 |
128 |
143 class CWCache(AnyEntity): |
129 class CWCache(AnyEntity): |
144 """Cache""" |
130 """Cache""" |
145 __regid__ = 'CWCache' |
131 __regid__ = 'CWCache' |
146 fetch_attrs, fetch_order = fetch_config(['name']) |
132 fetch_attrs, fetch_order = fetch_config(['name']) |