Merge pull request #18 from ppfeufer/development

v2.2.1

CHANGELOG.md

@@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [2.2.1] - 2020-09-23
+
+### Checked
+
+- Compatibility with the upcoming changes in Alliance Auth v2.8.0 (Django 3)
+
+### Changed
+
+- Fleet type embed color is now a color picker in admin backend
+
+
 ## [2.2.0] - 2020-09-16
 
 ### Added

fleetpings/__init__.py

@@ -6,5 +6,5 @@
 
 default_app_config = "fleetpings.apps.AaFleetpingsConfig"
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 __title__ = "Fleet Pings"

fleetpings/admin.py

@@ -3,7 +3,7 @@
 """
 settings for the admin backend
 """
-
+from fleetpings.form import FleetTypeAdminForm
 from fleetpings.models import (
     FleetComm,
     Webhook,
@@ -69,6 +69,7 @@ class FleetTypeAdmin(admin.ModelAdmin):
     FleetTypeAdmin
     """
 
+    form = FleetTypeAdminForm
     list_display = ("name", "embed_color", "notes", "is_enabled")
     list_filter = ("is_enabled",)
     filter_horizontal = ("restricted_to_group",)

fleetpings/app_settings.py

@@ -16,6 +16,9 @@
     "AA_FLEETPINGS_USE_DOCTRINES_FROM_FITTINGS_MODULE", False
 )
 
+# AA-GDPR
+AVOID_CDN = clean_setting("AVOID_CDN", False)
+
 
 def get_site_url():  # regex sso url
     """
@@ -46,3 +49,11 @@ def fittings_installed() -> bool:
     :return: bool
     """
     return "fittings" in settings.INSTALLED_APPS
+
+
+def avoid_cdn() -> bool:
+    """
+    check if we should avpiod CDN usage
+    :return: bool
+    """
+    return AVOID_CDN

fleetpings/form.py

@@ -0,0 +1,25 @@
+# coding=utf-8
+
+"""
+form declarations
+"""
+
+from django.forms import ModelForm, TextInput
+from fleetpings.models import FleetType
+
+
+class FleetTypeAdminForm(ModelForm):
+    """
+    form definitions for the FleetType form in admin
+    """
+
+    class Meta:
+        """
+        Meta
+        """
+
+        model = FleetType
+        fields = "__all__"
+        widgets = {
+            "embed_color": TextInput(attrs={"type": "color"}),
+        }

fleetpings/static/fleetpings/js/fleetpings.js

@@ -412,7 +412,7 @@ jQuery(document).ready(function($) {
          *
          * @type Clipboard
          */
-        var clipboardFleetPingData = new Clipboard('button#copyFleetPing');
+        var clipboardFleetPingData = new ClipboardJS('button#copyFleetPing');
 
         /**
          * copy success