Merge pull request #3 from Keyintegrity/borodulin/ITF-1614

add CurrentSiteManager

Author: dmitricus

dj_hde/client.py

@@ -7,7 +7,7 @@
 class DjHelpDeskEddyClient(HelpDeskEddyClient):
     def __init__(self):
         try:
-            self.config = Config.objects.get(is_active=True)
+            self.config = Config.on_site.get(is_active=True)
         except Config.DoesNotExist:
             raise NoActiveCredentials
         except Config.MultipleObjectsReturned:

dj_hde/migrations/0004_auto_20201012_1734.py

@@ -0,0 +1,26 @@
+# Generated by Django 2.2.14 on 2020-10-12 17:34
+import django.contrib.sites.managers
+from django.db import migrations, models
+import django.db.models.manager
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('sites', '0002_alter_domain_unique'),
+        ('dj_hde', '0003_auto_20201007_1326'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='config',
+            old_name='site_id',
+            new_name='site'
+        ),
+        migrations.AlterModelManagers(
+            name='config',
+            managers=[
+                ('objects', django.db.models.manager.Manager()),
+                ('on_site', django.contrib.sites.managers.CurrentSiteManager()),
+            ],
+        )
+    ]

dj_hde/models.py

@@ -2,6 +2,7 @@
 from django.db import models
 from django_mysql.models import JSONField
 from django.contrib.sites.models import Site
+from django.contrib.sites.managers import CurrentSiteManager
 from django.utils.translation import gettext_lazy as _
 
 
@@ -31,7 +32,10 @@ class Config(models.Model):
     api_key = models.CharField(max_length=256, verbose_name=_('API ключ'))
     departments = models.ManyToManyField(Department, verbose_name=_('Департаменты'))
     is_active = models.BooleanField(default=False, verbose_name=_('Активны'))
-    site_id = models.ForeignKey(Site, default=1, on_delete=models.CASCADE, verbose_name=_('ID Сайта'))
+    site = models.ForeignKey(Site, default=1, on_delete=models.CASCADE, verbose_name=_('ID Сайта'))
+
+    objects = models.Manager()
+    on_site = CurrentSiteManager()
 
     class Meta:
         verbose_name = _('Настройки')