From bb17a895073489cfe7229bc20d72d35efacc9431 Mon Sep 17 00:00:00 2001 From: Bruksx Date: Thu, 1 Oct 2026 15:11:14 +0100 Subject: [PATCH] fix migration imports --- .../migrations/0008_contactus_field.py | 4 ++-- .../migrations/0021_auto_20161017_1958.py | 10 ++++----- dynamicweb/settings/base.py | 6 +++++ .../0029_userhostingkey_created_at.py | 3 +-- hosting/models.py | 22 +++++++++---------- 5 files changed, 25 insertions(+), 20 deletions(-) diff --git a/datacenterlight/migrations/0008_contactus_field.py b/datacenterlight/migrations/0008_contactus_field.py index ceea8f8f..9b8e67b3 100644 --- a/datacenterlight/migrations/0008_contactus_field.py +++ b/datacenterlight/migrations/0008_contactus_field.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import datetime from django.db import migrations, models -from django.utils.timezone import utc +from datetime import timezone class Migration(migrations.Migration): @@ -17,7 +17,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='contactus', name='field', - field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2017, 8, 23, 13, 6, 24, 650869, tzinfo=utc)), + field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2017, 8, 23, 13, 6, 24, 650869, tzinfo=timezone.utc)), preserve_default=False, ), ] diff --git a/digitalglarus/migrations/0021_auto_20161017_1958.py b/digitalglarus/migrations/0021_auto_20161017_1958.py index 69b44dde..25f2a950 100644 --- a/digitalglarus/migrations/0021_auto_20161017_1958.py +++ b/digitalglarus/migrations/0021_auto_20161017_1958.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import datetime from django.db import migrations, models -from django.utils.timezone import utc +from datetime import timezone class Migration(migrations.Migration): @@ -17,25 +17,25 @@ class Migration(migrations.Migration): migrations.AddField( model_name='membership', name='end_date', - field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 0, 209303, tzinfo=utc)), + field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 0, 209303, tzinfo=timezone.utc)), preserve_default=False, ), migrations.AddField( model_name='membership', name='start_date', - field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 7, 361473, tzinfo=utc)), + field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 7, 361473, tzinfo=timezone.utc)), preserve_default=False, ), migrations.AddField( model_name='membershiporder', name='end_date', - field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 15, 657240, tzinfo=utc)), + field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 15, 657240, tzinfo=timezone.utc)), preserve_default=False, ), migrations.AddField( model_name='membershiporder', name='start_date', - field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 16, 897120, tzinfo=utc)), + field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 16, 897120, tzinfo=timezone.utc)), preserve_default=False, ), ] diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index c5056ed7..44ed7c71 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -794,3 +794,9 @@ try: from .dynamic import * # flake8: noqa except ImportError: pass + + +SILENCED_SYSTEM_CHECKS = [ + "cms.E001", + "fields.E903", +] \ No newline at end of file diff --git a/hosting/migrations/0029_userhostingkey_created_at.py b/hosting/migrations/0029_userhostingkey_created_at.py index 6ab968fd..37443ec8 100644 --- a/hosting/migrations/0029_userhostingkey_created_at.py +++ b/hosting/migrations/0029_userhostingkey_created_at.py @@ -4,7 +4,6 @@ from __future__ import unicode_literals import datetime from django.db import migrations, models -from django.utils.timezone import utc class Migration(migrations.Migration): @@ -17,7 +16,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='userhostingkey', name='created_at', - field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2017, 4, 30, 19, 4, 20, 780173, tzinfo=utc)), + field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2017, 4, 30, 19, 4, 20, 780173, tzinfo=datetime.timezone.utc)), preserve_default=False, ), ] diff --git a/hosting/models.py b/hosting/models.py index 47b3a7b3..12605c3e 100644 --- a/hosting/models.py +++ b/hosting/models.py @@ -113,7 +113,7 @@ class HostingOrder(AssignPermissionsMixin, models.Model): stripe_charge_id = models.CharField(max_length=100, null=True) price = models.FloatField() subscription_id = models.CharField(max_length=100, null=True) - vm_pricing = models.ForeignKey(VMPricing, on_delete=models.SET_NULL) + vm_pricing = models.ForeignKey(VMPricing, on_delete=models.SET_NULL, null=True) order_detail = models.ForeignKey( OrderDetail, null=True, blank=True, default=None, on_delete=models.SET_NULL @@ -128,9 +128,9 @@ class HostingOrder(AssignPermissionsMixin, models.Model): permissions = ('view_hostingorder',) class Meta: - permissions = ( + """permissions = ( ('view_hostingorder', 'View Hosting Order'), - ) + )""" def __str__(self): hosting_order_str = ("Order Nr: #{} - VM_ID: {} - {} - {} - " @@ -244,10 +244,10 @@ class HostingBill(AssignPermissionsMixin, models.Model): permissions = ('view_hostingbill',) - class Meta: + """class Meta: permissions = ( ('view_hostingbill', 'View Hosting Bill'), - ) + )""" def __str__(self): return "%s" % (self.customer.user.email) @@ -288,9 +288,9 @@ class MonthlyHostingBill(AssignPermissionsMixin, models.Model): permissions = ('view_monthlyhostingbill',) class Meta: - permissions = ( + """permissions = ( ('view_monthlyhostingbill', 'View Monthly Hosting'), - ) + )""" @classmethod def create(cls, args): @@ -499,9 +499,9 @@ class HostingBillLineItem(AssignPermissionsMixin, models.Model): permissions = ('view_hostingbilllineitem',) class Meta: - permissions = ( + """permissions = ( ('view_hostingbilllineitem', 'View Monthly Hosting Bill Line Item'), - ) + )""" def amount_in_chf(self): """ @@ -584,9 +584,9 @@ class UserCardDetail(AssignPermissionsMixin, models.Model): preferred = models.BooleanField(default=False) class Meta: - permissions = ( + """permissions = ( ('view_usercarddetail', 'View User Card'), - ) + )""" @classmethod def create(cls, stripe_customer=None, last4=None, brand=None,