src/cm/models.py
changeset 227 57492cd7e162
parent 175 4f072edc51a1
child 252 0f0a79f7f213
equal deleted inserted replaced
226:99d253569f36 227:57492cd7e162
   741             'comment_removed' : u'note_delete_small.png',
   741             'comment_removed' : u'note_delete_small.png',
   742         }
   742         }
   743     
   743     
   744     #type/msg
   744     #type/msg
   745     MSGS = {
   745     MSGS = {
   746          'text_edited' : ugettext_lazy(u'Text %(link_to_text)s edited'),
   746          'text_edited' : ugettext_lazy(u'Text %(link_to_text)s edited by %(creator)s'),
   747          'text_edited_new_version' : ugettext_lazy(u'Text %(link_to_text)s edited (new version created)'),
   747          'text_edited_new_version' : ugettext_lazy(u'Text %(link_to_text)s edited (new version created) by %(creator)s'),
   748          'text_created' :  ugettext_lazy(u'Text %(link_to_text)s added'),
   748          'text_created' :  ugettext_lazy(u'Text %(link_to_text)s added by %(creator)s'),
   749          'text_removed' : ugettext_lazy(u'Text %(link_to_text)s removed'),
   749          'text_removed' : ugettext_lazy(u'Text %(link_to_text)s removed'),
   750          'comment_created' : ugettext_lazy(u'Comment %(link_to_comment)s added on text %(link_to_text)s'),
   750          'comment_created' : ugettext_lazy(u'Comment %(link_to_comment)s added on text %(link_to_text)s by %(creator)s'),
   751          'comment_removed' : ugettext_lazy(u'Comment %(link_to_comment)s removed from text %(link_to_text)s'),
   751          'comment_removed' : ugettext_lazy(u'Comment %(link_to_comment)s removed from text %(link_to_text)s'),
   752          'user_created' : ugettext_lazy(u'User %(username)s added'),
   752          'user_created' : ugettext_lazy(u'User %(username)s added'),
   753          'user_enabled' : ugettext_lazy(u'User %(username)s access to workspace enabled'),
   753          'user_enabled' : ugettext_lazy(u'User %(username)s access to workspace enabled'),
   754          'user_refused' : ugettext_lazy(u'User %(username)s access to workspace refused'),
   754          'user_refused' : ugettext_lazy(u'User %(username)s access to workspace refused'),
   755          'user_suspended' : ugettext_lazy(u'User %(username)s access to workspace suspended'),
   755          'user_suspended' : ugettext_lazy(u'User %(username)s access to workspace suspended'),
   801         if msg:
   801         if msg:
   802             return mark_safe(msg % {
   802             return mark_safe(msg % {
   803                                      'link_to_text' : self.linkable_text_title(html=html, link=link) if self.text else None,
   803                                      'link_to_text' : self.linkable_text_title(html=html, link=link) if self.text else None,
   804                                      'link_to_comment' : self.linkable_comment_title(html=html, link=link) if self.comment else None,
   804                                      'link_to_comment' : self.linkable_comment_title(html=html, link=link) if self.comment else None,
   805                                      'username' : self.user.username if self.user else None,
   805                                      'username' : self.user.username if self.user else None,
       
   806                                      'creator' : self.originator_user.username if self.originator_user else ugettext_lazy(u'anonymous'),
   806                                     })
   807                                     })
   807         return ''
   808         return ''
   808     
   809     
   809     def printable_metadata(self, html=True):
   810     def printable_metadata(self, html=True):
   810         ret = []
   811         ret = []