aboutsummaryrefslogtreecommitdiffstats
path: root/servo/models/product.py
diff options
context:
space:
mode:
authorFilipp Lepalaan <filipp@mac.com>2015-09-10 14:17:04 +0300
committerFilipp Lepalaan <filipp@mac.com>2015-09-10 14:17:04 +0300
commit2deb6a356aab1c18443748e7c6d693e60086ddcf (patch)
treec71b1ed2db61f754902831d99547c2db99fe9600 /servo/models/product.py
parent46312d1a167d882253d24b0a883fb2378a070e11 (diff)
downloadServo-2deb6a356aab1c18443748e7c6d693e60086ddcf.tar.gz
Servo-2deb6a356aab1c18443748e7c6d693e60086ddcf.tar.bz2
Servo-2deb6a356aab1c18443748e7c6d693e60086ddcf.zip
Ditching Sites
Diffstat (limited to 'servo/models/product.py')
-rw-r--r--servo/models/product.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/servo/models/product.py b/servo/models/product.py
index f7cd418..5cd7f8b 100644
--- a/servo/models/product.py
+++ b/servo/models/product.py
@@ -34,12 +34,10 @@ from django.core.files import File
from django.core.cache import cache
from decimal import Decimal, ROUND_CEILING
from django.core.urlresolvers import reverse
+from django.contrib.sites.models import Site
from django.contrib.contenttypes.fields import GenericRelation
-from django.contrib.sites.managers import CurrentSiteManager
-
-from django.contrib.sites.models import Site
from django.utils.translation import ugettext_lazy as _
from mptt.models import MPTTModel, TreeForeignKey
@@ -207,12 +205,6 @@ class AbstractBaseProduct(models.Model):
class Product(AbstractBaseProduct):
-
- site = models.ForeignKey(
- Site,
- editable=False,
- default=defaults.site_id
- )
warranty_period = models.PositiveIntegerField(
default=0,
verbose_name=_("Warranty (months)")
@@ -557,13 +549,11 @@ class Product(AbstractBaseProduct):
class ProductCategory(MPTTModel):
-
site = models.ForeignKey(
Site,
editable=False,
default=defaults.site_id
)
-
title = models.CharField(
max_length=255,
unique=True,
@@ -578,7 +568,6 @@ class ProductCategory(MPTTModel):
)
objects = TreeManager()
- on_site = CurrentSiteManager()
def get_products(self):
return Product.objects.filter(
@@ -606,7 +595,7 @@ class ProductCategory(MPTTModel):
app_label = "servo"
get_latest_by = "id"
ordering = ("-title",)
- unique_together = ("title", "site", )
+ unique_together = ("title", "site",)
class Inventory(models.Model):