furrydelphia · mistressAlisi · Jul 9, 2024 · Jul 9, 2024 · Jul 11, 2024 · Jul 28, 2024
diff --git a/.github/workflows/production-docker.yml b/.github/workflows/production-docker.yml
@@ -3,8 +3,7 @@ name: Publish Docker Image (Production)
 on:
   push:
     branches:
-      - ply-ng
-      - 2024-stable
+      - production
 
 jobs:
 

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/ply.iml b/.idea/ply.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/communities/community/forge_api_views.py b/communities/community/forge_api_views.py
@@ -126,15 +126,14 @@ def create_community_sidebar_menu(request):
     )
     if len(is_admin) < 1:
         return render(request, "error-access-denied.html", {})
-    if request.POST["not_edited"] == "False":
-        logging.info(f"Creating new Sidebar Menu from data: Mode: {request.POST['application_mode']} Module: {request.POST['module']}. Class: {request.POST['sidebar_class']} in Community {request.POST['community']}")
-        form = CommunitySidebarMenuForm(request.POST)
-        # form.set_community(community)
-
-    else:
+    try:
+        created = False
         instance = CommunitySidebarMenu.objects.get(pk=request.POST["uuid"])
-        form = CommunitySidebarMenuForm(request.POST, instance=instance)
+    except CommunitySidebarMenu.DoesNotExist:
+        instance,created = CommunitySidebarMenu.objects.get_or_create(pk=request.POST["uuid"])
+    form = CommunitySidebarMenuForm(request.POST, instance=instance)
     if not form.is_valid():
+        instance.delete()
         return JsonResponse({"res": "err", "e": form.errors}, safe=False)
     else:
         form.instance.not_edited = True

diff --git a/communities/community/management/commands/populate_sidebars.py b/communities/community/management/commands/populate_sidebars.py
@@ -1,9 +1,12 @@
 from django.core.management.base import BaseCommand
 from django.contrib.auth.models import User
 import os, csv
+
+from django.db import IntegrityError
+
 from communities.community.models import (
     Community,
-    CommunitySidebarMenu
+    CommunitySidebarMenu, CommunityDashboardType
 )
 from communities.profiles.models import Profile
 from ply.models import PlyApplication
@@ -18,7 +21,7 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         community = options["community"]
         if community == "_all_":
-            cob = Community.objects.all()[0]
+            cob = Community.objects.all()
         else:
             cob = Community.objects.filter(hash=community)
         if len(cob) < 1:
@@ -28,8 +31,13 @@ def handle(self, *args, **options):
                 )
             )
             return False
-        for c in cob:
-            dtos = PlyApplication.objects.filter(active=True)
-            for d in dtos:
-                csmo = CommunitySidebarMenu.get_or_create(community=c,application_mode=d.mode,)
+        for dt in CommunityDashboardType.objects.all():
+            for c in cob:
+                dtos = PlyApplication.objects.all()
+                for d in dtos:
+                    try:
+                        self.stdout.write(f"Application: {d}, Mode: {dt.type}....")
+                        csmo = CommunitySidebarMenu.objects.get_or_create(community=c,application_mode=dt.type,module=d)
+                    except IntegrityError:
+                        pass
         self.stdout.write(self.style.SUCCESS("Success!"))
diff --git a/communities/community/migrations/0043_alter_communitysidebarmenu_module.py b/communities/community/migrations/0043_alter_communitysidebarmenu_module.py
@@ -1,18 +1,27 @@
-# Generated by Django 5.0.1 on 2024-09-07 03:09
+# Generated by Django 5.0.1 on 2024-08-15 01:29
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('community', '0042_merge_20240724_1003'),
+        ("community", "0042_merge_20240724_1003"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='communitysidebarmenu',
-            name='module',
-            field=models.TextField(choices=[('communities.preferences', 'communities.preferences'), ('communities.community', 'communities.community'), ('communities.dashboards', 'communities.dashboards'), ('media.gallery.core', 'media.gallery.core'), ('ufls.front', 'ufls.front'), ('ufls.event', 'ufls.event'), ('ufls.registrar', 'ufls.registrar'), ('ufls.dealers', 'ufls.dealers'), ('ufls.scheduling', 'ufls.scheduling'), ('ufls.staff', 'ufls.staff')], help_text='Application to Include in the Menus', max_length=200, verbose_name='Module/AppName:'),
+            model_name="communitysidebarmenu",
+            name="module",
+            field=models.TextField(
+                choices=[
+                    ("communities.preferences", "communities.preferences"),
+                    ("communities.community", "communities.community"),
+                    ("communities.dashboards", "communities.dashboards"),
+                    ("media.gallery.core", "media.gallery.core"),
+                ],
+                help_text="Application to Include in the Menus",
+                max_length=200,
+                verbose_name="Module/AppName:",
+            ),
         ),
     ]
diff --git a/communities/community/migrations/0044_alter_communitysidebarmenu_module.py b/communities/community/migrations/0044_alter_communitysidebarmenu_module.py
@@ -0,0 +1,28 @@
+# Generated by Django 5.0.1 on 2024-08-15 04:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("community", "0043_alter_communitysidebarmenu_module"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="communitysidebarmenu",
+            name="module",
+            field=models.TextField(
+                choices=[
+                    ("communities.preferences", "communities.preferences"),
+                    ("communities.community", "communities.community"),
+                    ("communities.dashboards", "communities.dashboards"),
+                    ("media.gallery.core", "media.gallery.core"),
+                    ("leagues.sports", "leagues.sports"),
+                ],
+                help_text="Application to Include in the Menus",
+                max_length=200,
+                verbose_name="Module/AppName:",
+            ),
+        ),
+    ]
diff --git a/communities/community/migrations/0045_alter_communitysidebarmenu_module.py b/communities/community/migrations/0045_alter_communitysidebarmenu_module.py
@@ -0,0 +1,30 @@
+# Generated by Django 5.0.8 on 2024-08-16 01:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("community", "0044_alter_communitysidebarmenu_module"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="communitysidebarmenu",
+            name="module",
+            field=models.TextField(
+                choices=[
+                    ("communities.preferences", "communities.preferences"),
+                    ("communities.community", "communities.community"),
+                    ("communities.dashboards", "communities.dashboards"),
+                    ("media.gallery.core", "media.gallery.core"),
+                    ("leagues.sports", "leagues.sports"),
+                    ("theodds.odds", "theodds.odds"),
+                    ("player.wager", "player.wager"),
+                ],
+                help_text="Application to Include in the Menus",
+                max_length=200,
+                verbose_name="Module/AppName:",
+            ),
+        ),
+    ]
diff --git a/communities/community/migrations/0046_alter_communitysidebarmenu_module.py b/communities/community/migrations/0046_alter_communitysidebarmenu_module.py
@@ -0,0 +1,31 @@
+# Generated by Django 5.0.8 on 2024-08-17 02:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("community", "0045_alter_communitysidebarmenu_module"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="communitysidebarmenu",
+            name="module",
+            field=models.TextField(
+                choices=[
+                    ("communities.preferences", "communities.preferences"),
+                    ("communities.community", "communities.community"),
+                    ("communities.dashboards", "communities.dashboards"),
+                    ("media.gallery.core", "media.gallery.core"),
+                    ("leagues.sports", "leagues.sports"),
+                    ("leagues.matches", "leagues.matches"),
+                    ("theodds.odds", "theodds.odds"),
+                    ("player.wager", "player.wager"),
+                ],
+                help_text="Application to Include in the Menus",
+                max_length=200,
+                verbose_name="Module/AppName:",
+            ),
+        ),
+    ]
diff --git a/communities/community/migrations/0047_alter_communitysidebarmenu_module.py b/communities/community/migrations/0047_alter_communitysidebarmenu_module.py
@@ -0,0 +1,31 @@
+# Generated by Django 5.0.1 on 2024-09-12 04:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("community", "0046_alter_communitysidebarmenu_module"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="communitysidebarmenu",
+            name="module",
+            field=models.TextField(
+                choices=[
+                    ("communities.preferences", "communities.preferences"),
+                    ("communities.community", "communities.community"),
+                    ("communities.dashboards", "communities.dashboards"),
+                    ("media.gallery.core", "media.gallery.core"),
+                    ("ufls.event", "ufls.event"),
+                    ("ufls.registrar", "ufls.registrar"),
+                    ("ufls.dealers", "ufls.dealers"),
+                    ("ufls.staff", "ufls.staff"),
+                ],
+                help_text="Application to Include in the Menus",
+                max_length=200,
+                verbose_name="Module/AppName:",
+            ),
+        ),
+    ]
diff --git a/communities/community/models.py b/communities/community/models.py
@@ -1,3 +1,5 @@
+from logging import NullHandler
+
 from django.db import models
 from django.contrib import admin
 import uuid
@@ -454,6 +456,16 @@ class Meta:
     bool_value = models.BooleanField(verbose_name="Boolean Value", null=True, blank=True,default=False)
     uuid_value = models.UUIDField(verbose_name="UUID Value", null=True, blank=True)
 
+    def clear_all(self,confirm=False):
+        if confirm:
+            self.text_value = None
+            self.int_value = None
+            self.json_value = None
+            self.bin_value = None
+            self.bool_value = False
+            self.uuid_value = None
+            self.save()
+
     def __str__(self):
         rstr = f"Community: {self.community.name} - Registry Setting {self.key}"
         if self.grouping_key:

diff --git a/communities/community/templates/dashboard/community_admin/dashboard/index.html b/communities/community/templates/dashboard/community_admin/dashboard/index.html
@@ -10,7 +10,7 @@
 {% block bootstrap5_content %}
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.min.js" integrity="sha512-Meww2sXqNHxI1+5Dyh/9KAtvI9RZSA4c1K2k5iL02oiPO/RH3Q30L3M1albtqMg50u4gRTYdV4EXOQqXEI336A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://kit.fontawesome.com/4f00122db6.js" crossorigin="anonymous"></script>
+<script src="https://kit.fontawesome.com/52b95d724a.js" crossorigin="anonymous"></script>
 <link href="/static/css/dashboard.css" rel="stylesheet">
 <link href="/static/communities.community/css/dashboard/base.css" rel="stylesheet">
 <link rel="preconnect" href="https://fonts.googleapis.com">

diff --git a/communities/community/templates/dashboard/community_admin/menus/table.html b/communities/community/templates/dashboard/community_admin/menus/table.html
@@ -19,8 +19,8 @@
       </td>
       <td>{{app.ordering}}</td>
       <td>{{app.active}}</td>
-      <td><a href="#edit_menu_{{app.pk}}" onclick="community_dashboard.edit_menu('{{app.pk}}');"><i class="fa-solid fa-pen-to-square"></i>&#160;Edit</a></td>
-      <td><a href="#edit_menu_{{app.pk}}" class="link-danger" onclick="community_dashboard.delete_menu('{{app.pk}}');"><i class="fa-solid fa-trash"></i>&#160;Del</a></td>
+      <td><a href="#communities.community%2Fmenus%2Feditor" onclick="community_dashboard.edit_menu('{{app.pk}}');"><i class="fa-solid fa-pen-to-square"></i>&#160;Edit</a></td>
+      <td><a href="#communities.community%2Fmenus%2Feditor" class="link-danger" onclick="community_dashboard.delete_menu('{{app.pk}}');"><i class="fa-solid fa-trash"></i>&#160;Del</a></td>
     </tr>
    {% endif %}
    {% endfor %}

diff --git a/communities/community/templates/dynapages/communities-community-installComplete-cover.html b/communities/community/templates/dynapages/communities-community-installComplete-cover.html
@@ -39,7 +39,7 @@
 
     {% block bootstrap5_extra_head %}{% endblock %}
     <!-- Font Awesome -->
-    <script src="https://kit.fontawesome.com/4f00122db6.js" crossorigin="anonymous"></script>
+    <script src="https://kit.fontawesome.com/52b95d724a.js" crossorigin="anonymous"></script>
 
     <!--     Fonts -->
     <link href="https://fonts.googleapis.com/css2?family=Lily+Script+One&display=swap" rel="stylesheet">

diff --git a/communities/preferences/management/commands/init_timezones.py b/communities/preferences/management/commands/init_timezones.py
@@ -11,7 +11,7 @@ def handle(self, *args, **options):
         # All profiles must be owned by the primary admin:
 
 
-        # Add a basic Header Widget to the dynapage template:
+
         self.stdout.write(self.style.SUCCESS('Creating Timezone Objects....'))
         for tzi in pytz.common_timezones:
             dto = datetime.datetime.now(pytz.timezone(tzi))

diff --git a/communities/profiles/templates/communities_profiles/profile_dashboard_dynapage_wrapper.html b/communities/profiles/templates/communities_profiles/profile_dashboard_dynapage_wrapper.html
@@ -7,7 +7,7 @@
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.min.js" integrity="sha512-Meww2sXqNHxI1+5Dyh/9KAtvI9RZSA4c1K2k5iL02oiPO/RH3Q30L3M1albtqMg50u4gRTYdV4EXOQqXEI336A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://kit.fontawesome.com/4f00122db6.js" crossorigin="anonymous"></script>
+<script src="https://kit.fontawesome.com/52b95d724a.js" crossorigin="anonymous"></script>
 <script src="https://unpkg.com/bs5-toast/dist/bs5-toast.js"></script>
 <script type="module" src="/static/dashboard/js/dashboard.js"></script>
 <header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">

diff --git a/communities/profiles/templates/profiles_index_view.html b/communities/profiles/templates/profiles_index_view.html
@@ -4,7 +4,7 @@
 {{community.name}} - All Profiles
 {% endblock %}
 {% block bootstrap5_content %}
-<script src="https://kit.fontawesome.com/4f00122db6.js" crossorigin="anonymous"></script>
+<script src="https://kit.fontawesome.com/52b95d724a.js" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.min.js" integrity="sha512-Meww2sXqNHxI1+5Dyh/9KAtvI9RZSA4c1K2k5iL02oiPO/RH3Q30L3M1albtqMg50u4gRTYdV4EXOQqXEI336A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="/static/js/dashboard_loginAgent.js"></script>

diff --git a/communities/stream/templates/stream/dashboard/dashboard.html b/communities/stream/templates/stream/dashboard/dashboard.html
@@ -14,7 +14,7 @@
 <link href="https://fonts.googleapis.com/css2?family=Lily+Script+One&display=swap" rel="stylesheet">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.min.js" integrity="sha512-Meww2sXqNHxI1+5Dyh/9KAtvI9RZSA4c1K2k5iL02oiPO/RH3Q30L3M1albtqMg50u4gRTYdV4EXOQqXEI336A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://kit.fontawesome.com/4f00122db6.js" crossorigin="anonymous"></script>
+<script src="https://kit.fontawesome.com/52b95d724a.js" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
 <script src="/static/js/dashboard.js"></script>
 <script src="/static/js/gallery_core.js"></script>

diff --git a/communities/stream/templates/stream/dashboard/profile_stream.html b/communities/stream/templates/stream/dashboard/profile_stream.html
@@ -36,7 +36,7 @@
 <link href="https://fonts.googleapis.com/css2?family=Lily+Script+One&display=swap" rel="stylesheet"> 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.min.js" integrity="sha512-Meww2sXqNHxI1+5Dyh/9KAtvI9RZSA4c1K2k5iL02oiPO/RH3Q30L3M1albtqMg50u4gRTYdV4EXOQqXEI336A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://kit.fontawesome.com/4f00122db6.js" crossorigin="anonymous"></script>
+<script src="https://kit.fontawesome.com/52b95d724a.js" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
 <script src="/static/js/dashboard.js"></script>
 <script src="/static/js/gallery_core.js"></script>

diff --git a/communities/stream/templates/stream_community_index_view.html b/communities/stream/templates/stream_community_index_view.html
@@ -36,7 +36,7 @@
 <link href="https://fonts.googleapis.com/css2?family=Lily+Script+One&display=swap" rel="stylesheet"> 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.min.js" integrity="sha512-Meww2sXqNHxI1+5Dyh/9KAtvI9RZSA4c1K2k5iL02oiPO/RH3Q30L3M1albtqMg50u4gRTYdV4EXOQqXEI336A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://kit.fontawesome.com/4f00122db6.js" crossorigin="anonymous"></script>
+<script src="https://kit.fontawesome.com/52b95d724a.js" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
 
 <div class="sticky-top">

diff --git a/communities/stream/templates/stream_profile_index_view.html b/communities/stream/templates/stream_profile_index_view.html
@@ -36,7 +36,7 @@
 <link href="https://fonts.googleapis.com/css2?family=Lily+Script+One&display=swap" rel="stylesheet"> 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.min.js" integrity="sha512-Meww2sXqNHxI1+5Dyh/9KAtvI9RZSA4c1K2k5iL02oiPO/RH3Q30L3M1albtqMg50u4gRTYdV4EXOQqXEI336A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://kit.fontawesome.com/4f00122db6.js" crossorigin="anonymous"></script>
+<script src="https://kit.fontawesome.com/52b95d724a.js" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>
 <script src="/static/js/dashboard.js"></script>
 <script src="/static/js/gallery_core.js"></script>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,7 @@ name: Publish Docker Image (Production) @@
     on:
       push:
         branches:
-          - ply-ng
-          - 2024-stable
+          - production
     jobs:
@@ Expand Down @@