Skip to content

Commit

Permalink
Allow sites to be blank
Browse files Browse the repository at this point in the history
  • Loading branch information
jochenklar committed Feb 14, 2020
1 parent 48d3f76 commit 38c34f1
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 19 deletions.
18 changes: 18 additions & 0 deletions rdmo/questions/migrations/0051_sites_blank.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.2.9 on 2020-02-14 10:33

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('questions', '0050_data_migration'),
]

operations = [
migrations.AlterField(
model_name='catalog',
name='sites',
field=models.ManyToManyField(blank=True, help_text='The sites this catalog belongs to (in a multi site setup).', to='sites.Site', verbose_name='Sites'),
),
]
20 changes: 9 additions & 11 deletions rdmo/questions/models.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
from django.core.cache import caches
from django.contrib.auth.models import Group
from django.contrib.sites.models import Site
from django.core.cache import caches
from django.db import models
from django.utils.translation import ugettext_lazy as _

from rdmo.core.utils import get_uri_prefix
from rdmo.core.models import Model, TranslationMixin
from rdmo.conditions.models import Condition
from rdmo.core.constants import VALUE_TYPE_CHOICES
from rdmo.core.models import Model, TranslationMixin
from rdmo.core.utils import get_uri_prefix
from rdmo.domain.models import Attribute
from rdmo.conditions.models import Condition

from .managers import CatalogManager, QuestionSetManager
from .validators import (
CatalogUniqueKeyValidator,
SectionUniquePathValidator,
QuestionSetUniquePathValidator,
QuestionUniquePathValidator
)
from .validators import (CatalogUniqueKeyValidator,
QuestionSetUniquePathValidator,
QuestionUniquePathValidator,
SectionUniquePathValidator)


class Catalog(Model, TranslationMixin):
Expand Down Expand Up @@ -49,7 +47,7 @@ class Catalog(Model, TranslationMixin):
help_text=_('The position of this catalog in lists.')
)
sites = models.ManyToManyField(
Site,
Site, blank=True,
verbose_name=_('Sites'),
help_text=_('The sites this catalog belongs to (in a multi site setup).')
)
Expand Down
18 changes: 18 additions & 0 deletions rdmo/tasks/migrations/0029_sites_blank.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.2.9 on 2020-02-14 10:28

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('tasks', '0028_data_migration'),
]

operations = [
migrations.AlterField(
model_name='task',
name='sites',
field=models.ManyToManyField(blank=True, help_text='The sites this task belongs to (in a multi site setup).', to='sites.Site', verbose_name='Sites'),
),
]
8 changes: 4 additions & 4 deletions rdmo/tasks/models.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from itertools import zip_longest
from datetime import date, timedelta
from itertools import zip_longest

from django.contrib.auth.models import Group
from django.contrib.sites.models import Site
from django.db import models
from django.utils.translation import ugettext_lazy as _

from rdmo.core.utils import get_uri_prefix
from rdmo.conditions.models import Condition
from rdmo.core.models import TranslationMixin
from rdmo.core.utils import get_uri_prefix
from rdmo.domain.models import Attribute
from rdmo.conditions.models import Condition

from .managers import TaskManager
from .validators import TaskUniqueKeyValidator
Expand Down Expand Up @@ -40,7 +40,7 @@ class Task(TranslationMixin, models.Model):
help_text=_('Additional internal information about this task.')
)
sites = models.ManyToManyField(
Site,
Site, blank=True,
verbose_name=_('Sites'),
help_text=_('The sites this task belongs to (in a multi site setup).')
)
Expand Down
18 changes: 18 additions & 0 deletions rdmo/views/migrations/0024_sites_blank.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.2.9 on 2020-02-14 10:33

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('views', '0023_data_migration'),
]

operations = [
migrations.AlterField(
model_name='view',
name='sites',
field=models.ManyToManyField(blank=True, help_text='The sites this view belongs to (in a multi site setup).', to='sites.Site', verbose_name='Sites'),
),
]
8 changes: 4 additions & 4 deletions rdmo/views/models.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from django.contrib.auth.models import Group
from django.contrib.sites.models import Site
from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.template import Context, Template
from django.utils.translation import ugettext_lazy as _

from rdmo.core.utils import get_uri_prefix
from rdmo.core.models import TranslationMixin
from rdmo.conditions.models import Condition
from rdmo.core.models import TranslationMixin
from rdmo.core.utils import get_uri_prefix
from rdmo.questions.models import Catalog

from .managers import ViewManager
Expand Down Expand Up @@ -43,7 +43,7 @@ class View(models.Model, TranslationMixin):
help_text=_('The catalogs this view can be used with. An empty list implies that this view can be used with every catalog.')
)
sites = models.ManyToManyField(
Site,
Site, blank=True,
verbose_name=_('Sites'),
help_text=_('The sites this view belongs to (in a multi site setup).')
)
Expand Down

0 comments on commit 38c34f1

Please sign in to comment.