Download as
Browse Code »

Commit b9b464ed14ec185845b7097e3a299489dcf98f82

Authored by Sergio Oliveira
1 parent 7fa6f9ce
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

Replaced get_user_model into models 

Django 1.7 requires that references to custom users into models.py to be
by settings instead of get_user_model
Showing 2 changed files with 11 additions and 21 deletions   Show diff stats
requirements.txt
  Diff comments   View file @b9b464e
1   -Django>=1.6.7,<1.7
2   -South==0.8.1
  1 +Django>=1.7
  2 +South==1.0.0
3 3 psycopg2==2.5.1
4 4 django-piston==0.2.3
5 5 pytz==2011n
... ...
src/super_archives/models.py
  Diff comments   View file @b9b464e
... ... @@ -8,11 +8,9 @@ from hashlib import md5
8 8 from django.db import models
9 9 from django.conf import settings
10 10 from django.utils import timezone
11   -from django.core.cache import cache
12 11 from django.dispatch import receiver
13   -from django.contrib.auth import get_user_model
14 12 from django.db.models.signals import post_save
15   -from django.core.urlresolvers import reverse, NoReverseMatch
  13 +from django.core.urlresolvers import reverse
16 14 from django.utils.translation import ugettext_lazy as _
17 15  
18 16 from html2text import html2text
... ... @@ -25,12 +23,9 @@ from .utils import blocks
25 23 from .utils.etiquetador import etiquetador
26 24  
27 25  
28   -User = settings.AUTH_USER_MODEL
29   -
30   -
31 26 class EmailAddressValidation(models.Model):
32 27 address = models.EmailField(unique=True)
33   - user = models.ForeignKey(User, null=True,
  28 + user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True,
34 29 related_name='emails_not_validated')
35 30 validation_key = models.CharField(max_length=32, null=True,
36 31 default=lambda: uuid4().hex)
... ... @@ -41,8 +36,8 @@ class EmailAddressValidation(models.Model):
41 36  
42 37  
43 38 class EmailAddress(models.Model):
44   - user = models.ForeignKey(User, null=True, related_name='emails',
45   - on_delete=models.SET_NULL)
  39 + user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True,
  40 + related_name='emails', on_delete=models.SET_NULL)
46 41 address = models.EmailField(unique=True)
47 42 real_name = models.CharField(max_length=64, blank=True, db_index=True)
48 43 md5 = models.CharField(max_length=32, null=True)
... ... @@ -71,7 +66,7 @@ class MailingList(models.Model):
71 66 name = models.CharField(max_length=80)
72 67 email = models.EmailField()
73 68 description = models.TextField()
74   - logo = models.FileField(upload_to='list_logo') #TODO
  69 + logo = models.FileField(upload_to='list_logo') # TODO
75 70 last_imported_index = models.IntegerField(default=0)
76 71  
77 72 def get_absolute_url(self):
... ... @@ -88,7 +83,7 @@ class MailingList(models.Model):
88 83  
89 84  
90 85 class MailingListMembership(models.Model):
91   - user = models.ForeignKey(User)
  86 + user = models.ForeignKey(settings.AUTH_USER_MODEL)
92 87 mailinglist = models.ForeignKey(MailingList)
93 88  
94 89 def __unicode__(self):
... ... @@ -101,7 +96,7 @@ class Keyword(models.Model):
101 96 thread = models.ForeignKey('Thread')
102 97  
103 98 class Meta:
104   - ordering = ('?', ) # random order
  99 + ordering = ('?', ) # random order
105 100  
106 101 def __unicode__(self):
107 102 return self.keyword
... ... @@ -221,7 +216,7 @@ class Thread(models.Model, HitCounterModelMixin):
221 216  
222 217  
223 218 class Vote(models.Model):
224   - user = models.ForeignKey(User)
  219 + user = models.ForeignKey(settings.AUTH_USER_MODEL)
225 220 message = models.ForeignKey('Message')
226 221 created = models.DateTimeField(auto_now_add=True)
227 222  
... ... @@ -392,12 +387,7 @@ class MessageMetadata(models.Model):
392 387 return 'Email Message Id: %s - %s: %s' % (self.Message.id,
393 388 self.name, self.value)
394 389  
395   -
396   -# For django 1.7 erase the 2 next lines
397   -from django.contrib.auth import get_user_model
398   -User = get_user_model()
399   -
400   -@receiver(post_save, sender=User)
  390 +@receiver(post_save, sender=settings.AUTH_USER_MODEL)
401 391 def create_email_address(sender, instance, created, **kwargs):
402 392 if not created:
403 393 return
... ...