Skip to content

Commit 07185d6

Browse files
committed
fix: By default, do not register category creation wizard
1 parent ecd27af commit 07185d6

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

djangocms_alias/cms_config.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
from django.conf import settings
55
from packaging.version import Version as PackageVersion
66

7-
from .cms_wizards import (
8-
create_alias_category_wizard,
9-
create_alias_wizard,
10-
)
7+
from .cms_wizards import create_alias_wizard
118
from .models import AliasContent, AliasPlugin, copy_alias_content
129
from .rendering import add_static_alias_js, render_alias_content
1310

@@ -24,7 +21,7 @@ class AliasCMSConfig(CMSAppConfig):
2421
cms_enabled = True
2522
cms_toolbar_enabled_models = [(AliasContent, render_alias_content, "alias")]
2623
moderated_models = [AliasContent]
27-
cms_wizards = [create_alias_wizard, create_alias_category_wizard]
24+
cms_wizards = [create_alias_wizard]
2825

2926
djangocms_moderation_enabled = getattr(settings, "MODERATING_ALIAS_MODELS_ENABLED", True)
3027
djangocms_versioning_enabled = getattr(settings, "VERSIONING_ALIAS_MODELS_ENABLED", djangocms_versioning_installed)

djangocms_alias/cms_plugins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def get_render_template(self, context, instance, placeholder):
4040
@classmethod
4141
def get_extra_plugin_menu_items(cls, request, plugin):
4242
if plugin.plugin_type == cls.__name__:
43-
alias_content = plugin.alias.get_content()
43+
alias_content = plugin.alias.get_content(show_draft_content=True)
4444
detach_endpoint = admin_reverse(
4545
DETACH_ALIAS_PLUGIN_URL_NAME,
4646
args=[plugin.pk],

djangocms_alias/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
from .models import AliasPlugin, Category
2424
from .utils import emit_content_change
2525

26-
JAVASCRIPT_SUCCESS_RESPONSE = """
26+
JAVASCRIPT_SUCCESS_RESPONSE = """<html>
27+
<body class="cms-close-frame">
2728
<div><div class="messagelist">
2829
<div class="success"></div>
2930
</div></div>

tests/test_wizards.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1+
from unittest import skipIf
2+
13
from cms.toolbar.utils import get_object_edit_url
24
from cms.utils import get_current_site
35
from cms.wizards.forms import WizardStep2BaseForm, step2_form_factory
46
from cms.wizards.helpers import get_entries as get_wizard_entires
57
from django.contrib.sites.models import Site
68
from django.utils import translation
79

10+
from djangocms_alias.cms_config import AliasCMSConfig
11+
from djangocms_alias.cms_wizards import create_alias_category_wizard
812
from djangocms_alias.models import Category
913
from djangocms_alias.utils import is_versioning_enabled
1014

1115
from .base import BaseAliasPluginTestCase
1216

17+
wizards = AliasCMSConfig.cms_wizards
18+
1319

1420
class WizardsTestCase(BaseAliasPluginTestCase):
1521
def _get_wizard_instance(self, wizard_name):
@@ -103,6 +109,7 @@ def test_create_alias_wizard_form_with_no_category_fallback_language(self):
103109

104110
self.assertTrue(category_name)
105111

112+
@skipIf(create_alias_category_wizard not in wizards, "CreateAliasCategoryWizard is not registered")
106113
def test_create_alias_category_wizard_instance(self):
107114
wizard = self._get_wizard_instance("CreateAliasCategoryWizard")
108115
self.assertEqual(wizard.title, "New alias category")
@@ -118,6 +125,7 @@ def test_create_alias_category_wizard_instance(self):
118125
wizard.user_has_add_permission(self.get_standard_user()),
119126
)
120127

128+
@skipIf(create_alias_category_wizard not in wizards, "CreateAliasCategoryWizard is not registered")
121129
def test_create_alias_category_wizard_form(self):
122130
wizard = self._get_wizard_instance("CreateAliasCategoryWizard")
123131
data = {

0 commit comments

Comments
 (0)