aa-bb 3.2.1__tar.gz → 3.2.2__tar.gz

{aa_bb-3.2.1 → aa_bb-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa_bb
-Version: 3.2.1
+Version: 3.2.2
 Summary: BigBrother
 Project-URL: Changelog, https://github.com/BroodLK/aa_bb/blob/main/CHANGELOG.md
 Project-URL: Issue / Bug Reports, https://github.com/BroodLK/aa_bb/issues
@@ -98,7 +98,7 @@ After making sure to add the above prerequisite applications.
 source /home/allianceserver/venv/auth/bin/activate && cd /home/allianceserver/myauth/
 ```
 ```bash
-pip install aa-bb==3.1.0b2
+pip install aa-bb==3.2.1
 ```
 ```bash
 vi myauth/settings/local.py

{aa_bb-3.2.1 → aa_bb-3.2.2}/README.md

@@ -58,7 +58,7 @@ After making sure to add the above prerequisite applications.
 source /home/allianceserver/venv/auth/bin/activate && cd /home/allianceserver/myauth/
 ```
 ```bash
-pip install aa-bb==3.1.0b2
+pip install aa-bb==3.2.1
 ```
 ```bash
 vi myauth/settings/local.py

{aa_bb-3.2.1 → aa_bb-3.2.2}/aa_bb/__init__.py

@@ -1,4 +1,4 @@
 """Initialize the app"""
 
-__version__ = "3.2.1"
+__version__ = "3.2.2"
 __title__ = "BigBrother"

{aa_bb-3.2.1 → aa_bb-3.2.2}/aa_bb/auth_hooks.py

@@ -11,6 +11,7 @@ from allianceauth.services.hooks import MenuItemHook, UrlHook
 from aa_bb import urls, urls_loa, urls_cb, urls_paps
 from .models import BigBrotherConfig, LeaveRequest
 
+from .app_settings import afat_active
 
 class CorpBrotherMenuItem(MenuItemHook):
     """This class ensures only authorized users will see the menu entry"""
@@ -174,10 +175,11 @@ def register_paps_menu():
     """Register the PAP stats sidebar entry."""
     return PapsMenuItem()
 
-@hooks.register("url_hook")
-def register_paps_urls():
-    """Wire the PAP URLconf into AllianceAuth."""
-    return UrlHook(urls_paps, "paps", r"^paps/")
+if afat_active():
+    @hooks.register("url_hook")
+    def register_paps_urls():
+        """Wire the PAP URLconf into AllianceAuth."""
+        return UrlHook(urls_paps, "paps", r"^paps/")
 
 
 @hooks.register('discord_cogs_hook')

{aa_bb-3.2.1 → aa_bb-3.2.2}/aa_bb/views_paps.py

@@ -16,15 +16,20 @@ from django.urls import reverse
 from .models import BigBrotherConfig, PapsConfig, PapCompliance, TicketToolConfig, LeaveRequest
 from .app_settings import get_user_profiles, get_user_characters, afat_active
 
-try:
-    from afat.models import Fat
-except ImportError:
-    logger.error("afat not installed; PAP generation will not work.")
+AFAT_INSTALLED = False
+if afat_active():
+    try:
+        from afat.models import Fat
+        AFAT_INSTALLED = True
+    except ImportError:
+        logger.error("afat not installed; PAP generation will not work.")
 
 @login_required
 @permission_required("aa_bb.can_generate_paps")
 def index(request):
     """Render the PAP entry form allowing recruiters to input monthly stats."""
+    if not afat_active():
+        return render(request, "paps/disabled.html")
     cfg = BigBrotherConfig.get_solo()
     if not cfg.is_paps_active:  # Disable UI when PAP module turned off.
         return render(request, "paps/disabled.html")
@@ -123,7 +128,7 @@ def index(request):
                 corp_paps += paps_to_add
 
 
-        if afat_active():  # Count Alliance FATs per character for corp PAP totals.
+        if AFAT_INSTALLED:  # Count Alliance FATs per character for corp PAP totals.
             for char in characters:
                 fats = Fat.objects.filter(
                     character__character_id=char,