From 1298765964968e6638cbf314fc494b23a6fb57ad Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Wed, 30 Aug 2023 16:08:24 +0300
Subject: [PATCH] 0.6.11 profile subscribe view

---
 SubscribesApp/js_views.py | 4 ++++
 SubscribesApp/models.py   | 1 +
 TWB/settings.py           | 2 ++
 requirements.pip          | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/SubscribesApp/js_views.py b/SubscribesApp/js_views.py
index 6ad6a92..63d5fd1 100644
--- a/SubscribesApp/js_views.py
+++ b/SubscribesApp/js_views.py
@@ -34,7 +34,11 @@ def show_cur_subscribe_ajax(request):
         else:
             tpl_name = 'blocks/profile/b_subscribe_current.html'
 
+        all_options = SubscribeOption.objects.filter(enable=True)
         subscribes = Subscribe.objects.filter(enable=True)
+        for subscribe in subscribes:
+            subscribe_options_ids = subscribe.options.values_list('id', flat=True)
+            subscribe.disabled_options = all_options.exclude(id__in=subscribe_options_ids)
 
         Dict = {
             'subscribe_for_user': subscribe_for_user,
diff --git a/SubscribesApp/models.py b/SubscribesApp/models.py
index 28ad7d6..523f536 100644
--- a/SubscribesApp/models.py
+++ b/SubscribesApp/models.py
@@ -7,6 +7,7 @@ class SubscribeOption(BaseModel):
     class Meta:
         verbose_name = _('Опция подписки')
         verbose_name_plural = _('Опции подписки')
+        ordering = ['order']
 
 
 
diff --git a/TWB/settings.py b/TWB/settings.py
index 51dd820..453397d 100644
--- a/TWB/settings.py
+++ b/TWB/settings.py
@@ -46,6 +46,8 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.humanize',
 
+    'colorfield',
+
     'ckeditor',
     'ckeditor_uploader',
 
diff --git a/requirements.pip b/requirements.pip
index 9c8dec4..8ec26ad 100644
--- a/requirements.pip
+++ b/requirements.pip
@@ -9,5 +9,5 @@ geopy
 channels==4.0.0
 daphne==4.0.0
 channels-redis==4.1.0
-
+django-colorfield