equal
deleted
inserted
replaced
19 |
19 |
20 __docformat__ = "restructuredtext en" |
20 __docformat__ = "restructuredtext en" |
21 from cubicweb import _ |
21 from cubicweb import _ |
22 |
22 |
23 from itertools import repeat |
23 from itertools import repeat |
|
24 |
|
25 from six import text_type |
24 |
26 |
25 from logilab.common.textutils import normalize_text |
27 from logilab.common.textutils import normalize_text |
26 from logilab.common.deprecation import class_renamed, class_moved, deprecated |
28 from logilab.common.deprecation import class_renamed, class_moved, deprecated |
27 from logilab.common.registry import yes |
29 from logilab.common.registry import yes |
28 |
30 |
180 return self._cw._('%(subject)s %(etype)s #%(eid)s (%(login)s)') % locals() |
182 return self._cw._('%(subject)s %(etype)s #%(eid)s (%(login)s)') % locals() |
181 |
183 |
182 def context(self, **kwargs): |
184 def context(self, **kwargs): |
183 entity = self.cw_rset.get_entity(self.cw_row or 0, self.cw_col or 0) |
185 entity = self.cw_rset.get_entity(self.cw_row or 0, self.cw_col or 0) |
184 for key, val in kwargs.items(): |
186 for key, val in kwargs.items(): |
185 if val and isinstance(val, unicode) and val.strip(): |
187 if val and isinstance(val, text_type) and val.strip(): |
186 kwargs[key] = self._cw._(val) |
188 kwargs[key] = self._cw._(val) |
187 kwargs.update({'user': self.user_data['login'], |
189 kwargs.update({'user': self.user_data['login'], |
188 'eid': entity.eid, |
190 'eid': entity.eid, |
189 'etype': entity.dc_type(), |
191 'etype': entity.dc_type(), |
190 'url': entity.absolute_url(__secure__=True), |
192 'url': entity.absolute_url(__secure__=True), |
253 return u'%s #%s (%s)' % (self._cw.__('New %s' % entity.e_schema), |
255 return u'%s #%s (%s)' % (self._cw.__('New %s' % entity.e_schema), |
254 entity.eid, self.user_data['login']) |
256 entity.eid, self.user_data['login']) |
255 |
257 |
256 |
258 |
257 def format_value(value): |
259 def format_value(value): |
258 if isinstance(value, unicode): |
260 if isinstance(value, text_type): |
259 return u'"%s"' % value |
261 return u'"%s"' % value |
260 return value |
262 return value |
261 |
263 |
262 |
264 |
263 class EntityUpdatedNotificationView(NotificationView): |
265 class EntityUpdatedNotificationView(NotificationView): |