Merge pull request #13527 from edx/release

Release
This commit is contained in:
Andy Armstrong
2016-09-22 13:05:33 -04:00
committed by GitHub
8 changed files with 11 additions and 153 deletions

View File

@@ -1,19 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('site_configuration', '0002_auto_20160720_0231'),
]
operations = [
migrations.AddField(
model_name='siteconfiguration',
name='receipt_page_url',
field=models.CharField(default=b'/commerce/checkout/receipt/?orderNum=', help_text='Path to order receipt page.', max_length=255),
),
]

View File

@@ -7,7 +7,6 @@ from django.db import models
from django.contrib.sites.models import Site
from django.db.models.signals import post_save
from django.dispatch import receiver
from django.utils.translation import ugettext_lazy as _
from django_extensions.db.models import TimeStampedModel
from jsonfield.fields import JSONField
@@ -26,8 +25,6 @@ class SiteConfiguration(models.Model):
site (OneToOneField): one to one field relating each configuration to a single site
values (JSONField): json field to store configurations for a site
"""
DEFAULT_RECEIPT_PAGE_URL = '/commerce/checkout/receipt/?orderNum='
site = models.OneToOneField(Site, related_name='configuration')
enabled = models.BooleanField(default=False, verbose_name="Enabled")
values = JSONField(
@@ -35,11 +32,6 @@ class SiteConfiguration(models.Model):
blank=True,
load_kwargs={'object_pairs_hook': collections.OrderedDict}
)
receipt_page_url = models.CharField(
max_length=255,
default=DEFAULT_RECEIPT_PAGE_URL,
help_text=_('Path to order receipt page.')
)
def __unicode__(self):
return u"<SiteConfiguration: {site} >".format(site=self.site)