Просмотр исходного кода

Add more missing app_labels

I don't know how I missed them. I think I must've made a mistake while
heavily rebasing this branch; it's the second time I'm surprised to not
find certain changes I'm confident I did.
master
Maik Hoepfel 11 лет назад
Родитель
Сommit
c5f8caaa00

+ 6
- 0
oscar/apps/address/abstract_models.py Просмотреть файл

@@ -402,6 +402,7 @@ class AbstractCountry(models.Model):
402 402
 
403 403
     class Meta:
404 404
         abstract = True
405
+        app_label = 'address'
405 406
         verbose_name = _('Country')
406 407
         verbose_name_plural = _('Countries')
407 408
         ordering = ('-display_order', 'printable_name',)
@@ -446,6 +447,8 @@ class AbstractShippingAddress(AbstractAddress):
446 447
 
447 448
     class Meta:
448 449
         abstract = True
450
+        # ShippingAddress is registered in order/models.py
451
+        app_label = 'order'
449 452
         verbose_name = _("Shipping address")
450 453
         verbose_name_plural = _("Shipping addresses")
451 454
 
@@ -518,6 +521,7 @@ class AbstractUserAddress(AbstractShippingAddress):
518 521
 
519 522
     class Meta:
520 523
         abstract = True
524
+        app_label = 'address'
521 525
         verbose_name = _("User address")
522 526
         verbose_name_plural = _("User addresses")
523 527
         ordering = ['-num_orders']
@@ -540,6 +544,8 @@ class AbstractBillingAddress(AbstractAddress):
540 544
 
541 545
     class Meta:
542 546
         abstract = True
547
+        # BillingAddress is registered in order/models.py
548
+        app_label = 'order'
543 549
         verbose_name = _("Billing address")
544 550
         verbose_name_plural = _("Billing addresses")
545 551
 

+ 4
- 0
oscar/apps/analytics/abstract_models.py Просмотреть файл

@@ -29,6 +29,7 @@ class AbstractProductRecord(models.Model):
29 29
 
30 30
     class Meta:
31 31
         abstract = True
32
+        app_label = 'analytics'
32 33
         ordering = ['-num_purchases']
33 34
         verbose_name = _('Product record')
34 35
         verbose_name_plural = _('Product records')
@@ -64,6 +65,7 @@ class AbstractUserRecord(models.Model):
64 65
 
65 66
     class Meta:
66 67
         abstract = True
68
+        app_label = 'analytics'
67 69
         verbose_name = _('User record')
68 70
         verbose_name_plural = _('User records')
69 71
 
@@ -76,6 +78,7 @@ class AbstractUserProductView(models.Model):
76 78
 
77 79
     class Meta:
78 80
         abstract = True
81
+        app_label = 'analytics'
79 82
         verbose_name = _('User product view')
80 83
         verbose_name_plural = _('User product views')
81 84
 
@@ -92,6 +95,7 @@ class AbstractUserSearch(models.Model):
92 95
 
93 96
     class Meta:
94 97
         abstract = True
98
+        app_label = 'analytics'
95 99
         verbose_name = _("User search query")
96 100
         verbose_name_plural = _("User search queries")
97 101
 

+ 3
- 2
oscar/apps/promotions/models.py Просмотреть файл

@@ -27,6 +27,7 @@ class LinkedPromotion(models.Model):
27 27
 
28 28
     class Meta:
29 29
         abstract = True
30
+        app_label = 'promotions'
30 31
         ordering = ['-clicks']
31 32
         verbose_name = _("Linked Promotion")
32 33
         verbose_name_plural = _("Linked Promotions")
@@ -51,7 +52,7 @@ class PagePromotion(LinkedPromotion):
51 52
         return reverse('promotions:page-click',
52 53
                        kwargs={'page_promotion_id': self.id})
53 54
 
54
-    class Meta:
55
+    class Meta(LinkedPromotion.Meta):
55 56
         verbose_name = _("Page Promotion")
56 57
         verbose_name_plural = _("Page Promotions")
57 58
 
@@ -74,7 +75,7 @@ class KeywordPromotion(LinkedPromotion):
74 75
         return reverse('promotions:keyword-click',
75 76
                        kwargs={'keyword_promotion_id': self.id})
76 77
 
77
-    class Meta:
78
+    class Meta(LinkedPromotion.Meta):
78 79
         verbose_name = _("Keyword Promotion")
79 80
         verbose_name_plural = _("Keyword Promotions")
80 81
 

Загрузка…
Отмена
Сохранить