fix: Minor usability improvements (#317)

* fix: ajax_error_msg
* Fix tests
* Feat: New draft in stead of edit button if editing will create a new draft
* feat: discard changes menu
* Fix: Discard changes only if there are changes
* Replace deprecated icons
* Update admin.py to use new cms.icons.css
* Consistent labels for "Discard Changes"

Author: fsbraun

djangocms_versioning/admin.py

@@ -130,7 +130,7 @@ class Media:
         js = ("admin/js/jquery.init.js", "djangocms_versioning/js/actions.js")
         css = {
             "all": (
-                static_with_version("cms/css/cms.pagetree.css"),
+                static_with_version("cms/css/cms.icons.css"),
                 "djangocms_versioning/css/actions.css",
             )
         }
@@ -402,7 +402,7 @@ class VersionAdmin(admin.ModelAdmin):
     class Media:
         js = ("admin/js/jquery.init.js", "djangocms_versioning/js/actions.js", "djangocms_versioning/js/compare.js",)
         css = {"all": (
-            static_with_version("cms/css/cms.pagetree.css"),
+            static_with_version("cms/css/cms.icons.css"),
             "djangocms_versioning/css/actions.css",
         )}
 

djangocms_versioning/cms_config.py

@@ -1,7 +1,6 @@
 import collections
 
 from django.conf import settings
-from django.contrib import messages
 from django.contrib.admin.utils import flatten_fieldsets
 from django.core.exceptions import (
     ImproperlyConfigured,
@@ -358,7 +357,7 @@ def change_innavigation(self, request, object_id):
         try:
             version.check_modify(request.user)
         except ConditionFailed as e:
-            self.message_user(request, force_str(e), messages.ERROR)
+            # Send error message
             return HttpResponseForbidden(force_str(e))
         return super().change_innavigation(request, object_id)
 

djangocms_versioning/cms_toolbars.py

@@ -4,6 +4,7 @@
 from django.apps import apps
 from django.conf import settings
 from django.contrib.auth import get_permission_codename
+from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from django.utils.http import urlencode
 from django.utils.translation import gettext_lazy as _
@@ -15,15 +16,15 @@
     PlaceholderToolbar,
 )
 from cms.models import PageContent
-from cms.toolbar.items import ButtonList
+from cms.toolbar.items import Break, ButtonList
 from cms.toolbar.utils import get_object_preview_url
 from cms.toolbar_pool import toolbar_pool
 from cms.utils import page_permissions
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_language_dict, get_language_tuple
 from cms.utils.urlutils import add_url_parameters, admin_reverse
 
-from djangocms_versioning.constants import PUBLISHED
+from djangocms_versioning.constants import DRAFT, PUBLISHED
 from djangocms_versioning.helpers import (
     get_latest_admin_viewable_page_content,
     version_list_url,
@@ -107,8 +108,15 @@ def _add_edit_button(self, disabled=False):
                 ),
                 args=(version.pk,),
             )
+            pks_for_grouper = version.versionable.for_content_grouping_values(
+                version.content
+            ).values_list("pk", flat=True)
+            content_type = ContentType.objects.get_for_model(version.content)
+            draft_exists = Version.objects.filter(
+                object_id__in=pks_for_grouper, content_type=content_type, state=DRAFT
+            ).exists()
             item.add_button(
-                _("Edit"),
+                _("Edit") if draft_exists else _("New Draft"),
                 url=edit_url,
                 disabled=disabled,
                 extra_classes=["cms-btn-action", "cms-versioning-js-edit-btn"],
@@ -164,6 +172,7 @@ def _add_versioning_menu(self):
         ):
             url = version_list_url(version.content)
             versioning_menu.add_sideframe_item(_("Manage Versions"), url=url)
+            # Compare to source menu entry
             if version.source:
                 name = _("Compare to {source}").format(source=_(version.source.short_name()))
                 proxy_model = self._get_proxy_model()
@@ -176,6 +185,15 @@ def _add_versioning_menu(self):
                     back=self.request.get_full_path(),
                 ))
                 versioning_menu.add_link_item(name, url=url)
+                # Discard changes menu entry (wrt to source)
+                if version.check_discard.as_bool(self.request.user):  # pragma: no cover
+                    versioning_menu.add_item(Break())
+                    versioning_menu.add_link_item(
+                        _("Discard Changes"),
+                        url=reverse("admin:{app}_{model}_discard".format(
+                            app=proxy_model._meta.app_label, model=proxy_model.__name__.lower()
+                        ), args=(version.pk,))
+                    )
 
     def _get_published_page_version(self):
         """Returns a published page if one exists for the toolbar object

djangocms_versioning/helpers.py

@@ -279,7 +279,7 @@ def get_admin_url(model, action, *args):
 
 def remove_published_where(queryset):
     """
-    By default the versioned queryset filters out so that only versions
+    By default, the versioned queryset filters out so that only versions
     that are published are returned. If you need to return the full queryset
     this method can be used.
 

djangocms_versioning/indicators.py

@@ -77,7 +77,7 @@ def get_indicator_menu(cls, request, page_content):
                 ))
             if len(versions) >= 2 and versions[0].state == DRAFT and versions[1].state == PUBLISHED:
                 menu.append((
-                    _("Compare Draft to Published..."), "cms-icon-layers",
+                    _("Compare Draft to Published..."), "cms-icon-compare",
                     reverse("admin:djangocms_versioning_pagecontentversion_compare", args=(versions[1].pk,)) +
                     "?" + urlencode(dict(
                         compare_to=versions[0].pk,
@@ -87,7 +87,7 @@ def get_indicator_menu(cls, request, page_content):
                 ))
         menu.append(
             (
-                _("Manage Versions..."), "cms-icon-copy",
+                _("Manage Versions..."), "cms-icon-manage-versions",
                 version_list_url(versions[0].content),
                 "",
             )