diff --git a/setup.py b/setup.py index 0b0afa9d..ffcca42a 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ def get_requirements(fname='requirements.txt'): setup( name="unicms", - version='0.27.0', + version='0.27.1', description="uniCMS is a Django Web Content Management System", long_description=README, long_description_content_type='text/markdown', diff --git a/src/cms/contexts/migrations/0010_alter_webpath_options.py b/src/cms/contexts/migrations/0010_alter_webpath_options.py new file mode 100644 index 00000000..a7ff75cd --- /dev/null +++ b/src/cms/contexts/migrations/0010_alter_webpath_options.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.5 on 2021-10-14 21:33 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cmscontexts', '0009_alter_webpath_options'), + ] + + operations = [ + migrations.AlterModelOptions( + name='webpath', + options={'ordering': ['path'], 'verbose_name_plural': 'Site Contexts (WebPaths)'}, + ), + ] diff --git a/src/cms/contexts/migrations/0011_alter_webpath_options.py b/src/cms/contexts/migrations/0011_alter_webpath_options.py new file mode 100644 index 00000000..c3ca3484 --- /dev/null +++ b/src/cms/contexts/migrations/0011_alter_webpath_options.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.5 on 2021-10-14 21:38 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cmscontexts', '0010_alter_webpath_options'), + ] + + operations = [ + migrations.AlterModelOptions( + name='webpath', + options={'ordering': ['fullpath'], 'verbose_name_plural': 'Site Contexts (WebPaths)'}, + ), + ] diff --git a/src/cms/contexts/models.py b/src/cms/contexts/models.py index ce63d211..9e1ea8df 100644 --- a/src/cms/contexts/models.py +++ b/src/cms/contexts/models.py @@ -82,7 +82,7 @@ class WebPath(ActivableModel, TimeStampedModel, CreatedModifiedBy): class Meta: verbose_name_plural = _("Site Contexts (WebPaths)") - ordering = ['name'] + ordering = ['fullpath'] def split(self) -> list: """ diff --git a/src/cms/publications/migrations/0019_alter_publicationcontext_options.py b/src/cms/publications/migrations/0019_alter_publicationcontext_options.py new file mode 100644 index 00000000..b070c8f1 --- /dev/null +++ b/src/cms/publications/migrations/0019_alter_publicationcontext_options.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.5 on 2021-10-14 21:39 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('cmspublications', '0018_alter_publicationcontext_options'), + ] + + operations = [ + migrations.AlterModelOptions( + name='publicationcontext', + options={'ordering': ['webpath__fullpath', 'order'], 'verbose_name_plural': 'Publication Contexts'}, + ), + ] diff --git a/src/cms/publications/models.py b/src/cms/publications/models.py index 0c9c5205..55eff2de 100644 --- a/src/cms/publications/models.py +++ b/src/cms/publications/models.py @@ -351,7 +351,7 @@ class PublicationContext(TimeStampedModel, ActivableModel, class Meta: verbose_name_plural = _("Publication Contexts") - ordering = ['order'] + ordering = ['webpath__fullpath', 'order'] @property def path_prefix(self):