Download as
Browse Code »

Commit 15b76e535897a9913cc44fba87369a628fe4ab02

Authored by Sergio Oliveira
1 parent 6fb257c6
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Using email to id user

Showing 1 changed file with 3 additions and 4 deletions   Show diff stats
src/super_archives/models.py
  Diff comments   View file @15b76e5
... ... @@ -35,13 +35,12 @@ class EmailAddress(models.Model):
35 35 def get_full_name(self):
36 36 if self.user and self.user.get_full_name():
37 37 return self.user.get_full_name()
38   - elif self.user and self.username:
39   - return self.username
40 38 elif self.real_name:
41 39 return self.real_name
42 40  
43 41 def get_profile_link(self):
44 42 if self.user:
  43 + # TODO: stop using username in url
45 44 return reverse('user_profile', args=[self.user.username])
46 45 else:
47 46 return reverse('colab.deprecated.views.userprofile.by_emailhash',
... ... @@ -67,7 +66,7 @@ class UserProfile(models.Model):
67 66 verbose_name_plural = _(u"Users Profiles")
68 67  
69 68 def __unicode__(self):
70   - return '%s (%s)' % (self.user.get_full_name(), self.user.username)
  69 + return '"%s" <%s>' % (self.get_full_name(), self.email)
71 70  
72 71 # This does the same the same than related_name argument but it also creates
73 72 # a profile in the case it doesn't exist yet.
... ... @@ -90,7 +89,7 @@ class MailingListMembership(models.Model):
90 89 mailinglist = models.ForeignKey(MailingList)
91 90  
92 91 def __unicode__(self):
93   - return '%s on %s' % (self.user.username, self.mailinglist.name)
  92 + return '%s on %s' % (self.user.email, self.mailinglist.name)
94 93  
95 94  
96 95 class Thread(models.Model):
... ...