django-spire 0.16.10__py3-none-any.whl → 0.16.11__py3-none-any.whl

django_spire/help_desk/apps.py

@@ -7,6 +7,14 @@ class HelpDeskConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     label = 'django_spire_help_desk'
     name = 'django_spire.help_desk'
+    MODEL_PERMISSIONS = (
+        {
+            'name': 'help_desk',
+            'verbose_name': 'Help Desk',
+            'model_class_path': 'django_spire.help_desk.models.HelpDeskTicket',
+            'is_proxy_model': False,
+        },
+    )
 
     REQUIRED_APPS = ('django_spire_core',)
     URLPATTERNS_INCLUDE = 'django_spire.help_desk.urls'

django_spire/help_desk/auth/controller.py

@@ -0,0 +1,15 @@
+from django_spire.auth.controller.controller import BaseAuthController
+
+
+class BaseHelpDeskAuthController(BaseAuthController):
+    def can_add(self):
+        return self.request.user.has_perm('django_spire_help_desk.add_helpdeskticket')
+
+    def can_change(self):
+        return self.request.user.has_perm('django_spire_help_desk.change_helpdeskticket')
+
+    def can_delete(self):
+        return self.request.user.has_perm('django_spire_help_desk.delete_helpdeskticket')
+
+    def can_view(self):
+        return self.request.user.has_perm('django_spire_help_desk.view_helpdeskticket')

django_spire/help_desk/templates/django_spire/help_desk/card/ticket_detail_card.html

@@ -7,15 +7,9 @@
 {% endblock %}
 
 {% block card_button %}
-    {% if perms.django_spire_help_desk.change_helpdeskticket %}
-        <div class="pe-3">
-            {% url 'django_spire:help_desk:form:update' pk=ticket.pk as edit_url %}
-            {% include 'django_spire/button/primary_button.html' with button_text='Edit' button_href=edit_url button_icon='bi bi-pencil' %}
-        </div>
-    {% endif %}
-    {% if perms.django_spire_help_desk.delete_helpdeskticket %}
-        {% url 'django_spire:help_desk:page:delete' pk=ticket.pk as delete_url %}
-        {% include 'django_spire/button/danger_button.html' with button_text='Delete' button_href=delete_url button_icon='bi bi-trash' %}
+    {% if AuthController.help_desk.can_change %}
+        {% url 'django_spire:help_desk:form:update' pk=ticket.pk as edit_url %}
+        {% include 'django_spire/button/primary_button.html' with button_text='Edit' button_href=edit_url button_icon='bi bi-pencil' %}
     {% endif %}
 {% endblock %}
 

django_spire/help_desk/templates/django_spire/help_desk/card/ticket_list_card.html

@@ -3,17 +3,16 @@
 {% block card_title_content_style %}{% endblock %}
 
 {% block card_title %}
-    <div class="row justify-content-between">
-        <div class="col text-start">
-            Tickets
+    Tickets
+{% endblock %}
+
+{% block card_button %}
+    {% if AuthController.help_desk.can_add %}
+        <div class="col text-end mb-1">
+            {% url 'django_spire:help_desk:form:create' as create_url %}
+            {% include 'django_spire/button/primary_button.html' with button_text='Add' button_href=create_url button_icon="bi bi-plus" %}
         </div>
-        {% if perms.django_spire_help_desk.add_helpdeskticket %}
-            <div class="col text-end mb-1">
-                {% url 'django_spire:help_desk:form:create' as create_url %}
-                {% include 'django_spire/button/primary_button.html' with button_text='Add' button_href=create_url button_icon="bi bi-plus" %}
-            </div>
-        {% endif %}
-    </div>
+    {% endif %}
 {% endblock %}
 
 {% block card_title_content %}

django_spire/help_desk/templates/django_spire/help_desk/element/icon.html

@@ -0,0 +1,3 @@
+<a href="{% url 'django_spire:help_desk:page:list' %}">
+    <i class="bi bi-headset fs-2 mx-2 text-app-default-text-color"></i>
+</a>

django_spire/help_desk/templates/django_spire/help_desk/form/ticket_form.html

@@ -25,7 +25,7 @@
     <div class="col-12 mb-1 mt-3">
         {% include 'django_glue/form/field/text_field.html' with glue_model_field='ticket.description' %}
     </div>
-    <div class="text-end my-2">
+    <div class="my-2">
         {% include 'django_spire/contrib/form/button/form_submit_button.html' %}
     </div>
 </form>

django_spire/help_desk/templates/django_spire/help_desk/item/ticket_item.html

@@ -1,37 +1,38 @@
 {% extends 'django_spire/item/item.html' %}
 
-{% block item_title_col %}d-none{% endblock %}
+{% block item_title_col %}{% endblock %}
 
 {% block item_row_content %}
-        <a class="col-12 col-sm-4 mb-2 mb-sm-0" href="{% url 'django_spire:help_desk:page:detail' pk=ticket.pk %}">
-            {% include 'django_spire/element/attribute_element.html' with attribute_title=ticket attribute_value=ticket.description|truncatechars:50 %}
-        </a>
-        <div class="col-6 col-sm-2 mb-2 mb-sm-0 text-start">
-            {% include 'django_spire/element/attribute_element.html' with attribute_value=ticket.created_by.get_full_name attribute_title='Created By' %}
-        </div>
-        <div class="col-6 col-sm-2 mb-2 mb-sm-0 text-start">
-            {% include 'django_spire/element/attribute_element.html' with attribute_value=ticket.created_datetime|date:'M d, Y' attribute_title='Created At' %}
-        </div>
-        <div class="col">
-            {% include 'django_spire/element/attribute_element.html' with attribute_title='Purpose' %}
-            {% include 'django_spire/help_desk/element/ticket_purpose_badge.html' %}
-        </div>
-        <div class="col">
-            {% include 'django_spire/element/attribute_element.html' with attribute_title='Priority' %}
-            {% include 'django_spire/help_desk/element/ticket_priority_badge.html' %}
-        </div>
-        <div class="col">
-            {% include 'django_spire/element/attribute_element.html' with attribute_title='Status' %}
-            {% include 'django_spire/help_desk/element/ticket_status_badge.html' %}
-        </div>
-        <div class="col-6 col-sm-1 text-end">
-            {% url 'django_spire:help_desk:page:detail' pk=ticket.pk as detail_url %}
-            {% if perms.django_spire_help_desk.change_helpdeskticket %}
-                {% url 'django_spire:help_desk:form:update' pk=ticket.pk as update_url %}
-            {% endif %}
-            {% if perms.django_spire_help_desk.delete_helpdeskticket %}
-                {% url 'django_spire:help_desk:page:delete' pk=ticket.pk as delete_url %}
-            {% endif %}
-            {% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url=detail_url edit_url=update_url delete_url=delete_url %}
-        </div>
+    <a class="col-12 col-sm-4 mb-2 mb-sm-0" href="{% url 'django_spire:help_desk:page:detail' pk=ticket.pk %}">
+        {% include 'django_spire/element/attribute_element.html' with attribute_value=ticket.description|truncatechars:50 %}
+    </a>
+    <div class="col-6 col-sm-2 mb-2 mb-sm-0 text-start">
+        {% include 'django_spire/element/attribute_element.html' with attribute_value=ticket.created_by.get_full_name attribute_title='Created By' %}
+    </div>
+    <div class="col-6 col-sm-2 mb-2 mb-sm-0 text-start">
+        {% include 'django_spire/element/attribute_element.html' with attribute_value=ticket.created_datetime|date:'M d, Y' attribute_title='Created At' %}
+    </div>
+    <div class="col">
+        {% include 'django_spire/element/attribute_element.html' with attribute_title='Purpose' %}
+        {% include 'django_spire/help_desk/element/ticket_purpose_badge.html' %}
+    </div>
+    <div class="col">
+        {% include 'django_spire/element/attribute_element.html' with attribute_title='Priority' %}
+        {% include 'django_spire/help_desk/element/ticket_priority_badge.html' %}
+    </div>
+    <div class="col">
+        {% include 'django_spire/element/attribute_element.html' with attribute_title='Status' %}
+        {% include 'django_spire/help_desk/element/ticket_status_badge.html' %}
+    </div>
+{% endblock %}
+
+{% block item_button %}
+    {% url 'django_spire:help_desk:page:detail' pk=ticket.pk as detail_url %}
+    {% if AuthController.help_desk.can_change %}
+        {% url 'django_spire:help_desk:form:update' pk=ticket.pk as update_url %}
+    {% endif %}
+    {% if AuthController.help_desk.can_delete %}
+        {% url 'django_spire:help_desk:page:delete' pk=ticket.pk as delete_url %}
+    {% endif %}
+    {% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url=detail_url edit_url=update_url delete_url=delete_url %}
 {% endblock %}

django_spire/help_desk/views/form_views.py

@@ -2,14 +2,14 @@ import django_glue as dg
 from django.shortcuts import redirect, get_object_or_404
 from django.urls import reverse
 
-from django_spire.auth.permissions.decorators import permission_required
+from django_spire.auth.controller.controller import AppAuthController
 from django_spire.contrib.form.utils import show_form_errors
 from django_spire.contrib.generic_views import portal_views
 from django_spire.help_desk import forms
 from django_spire.help_desk.models import HelpDeskTicket
 
 
-@permission_required('django_spire_help_desk.add_helpdeskticket')
+@AppAuthController('help_desk').permission_required('can_add')
 def ticket_create_form_view(request):
     ticket = HelpDeskTicket()
 
@@ -42,7 +42,7 @@ def ticket_create_form_view(request):
     )
 
 
-@permission_required('django_spire_help_desk.change_helpdeskticket')
+@AppAuthController('help_desk').permission_required('can_change')
 def ticket_update_form_view(request, pk: int):
     ticket = get_object_or_404(HelpDeskTicket, pk=pk)
 

django_spire/help_desk/views/page_views.py

@@ -1,13 +1,12 @@
-from django.contrib.auth.decorators import login_required
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 
-from django_spire.auth.permissions.decorators import permission_required
+from django_spire.auth.controller.controller import AppAuthController
 from django_spire.contrib.generic_views import portal_views
 from django_spire.help_desk.models import HelpDeskTicket
 
 
-@permission_required('django_spire_help_desk.delete_helpdeskticket')
+@AppAuthController('help_desk').permission_required('can_delete')
 def ticket_delete_view(request, pk):
     ticket = get_object_or_404(HelpDeskTicket, pk=pk)
 
@@ -21,7 +20,7 @@ def ticket_delete_view(request, pk):
     )
 
 
-@login_required()
+@AppAuthController('help_desk').permission_required('can_view')
 def ticket_detail_view(request, pk):
     ticket = get_object_or_404(HelpDeskTicket, pk=pk)
 
@@ -35,7 +34,7 @@ def ticket_detail_view(request, pk):
     )
 
 
-@login_required()
+@AppAuthController('help_desk').permission_required('can_view')
 def ticket_list_view(request):
     tickets = HelpDeskTicket.objects.order_by('-created_datetime').active()
 

django_spire/knowledge/entry/views/json_views.py

@@ -41,7 +41,7 @@ def reorder_view(request: WSGIRequest) -> JsonResponse:
         destination_objects=(
             collection.entries
             .has_current_version()
-            .request_user_has_access(user=request.user)
+            .user_has_access(user=request.user)
             .active()
         ),
         position=order,

django_spire/knowledge/templates/django_spire/knowledge/collection/card/context_menu_card.html

@@ -7,23 +7,23 @@
         top: y + 'px',
         left: x + 'px',
     }"
-    class="position-fixed card shadow-lg z-3 vstack cursor-pointer bg-app-layer-one"
+    class="position-fixed card shadow-lg z-3 vstack cursor-pointer bg-app-layer-one border"
     @click.away="hide_menu()"
 >
     <span class="px-2 py-1" x-text="title"></span>
 
     {% if AuthController.knowledge.can_change %}
-        <span class="border-top bg-app-layer-one-hover px-3 text-app-default-link-color" @click="edit_collection()">
+        <span class="border-top bg-app-layer-three-hover px-3 text-app-default-link-color dropdown-item" @click="edit_collection()">
             <i class="bi bi-pencil pe-1"></i>
             Edit Collection
         </span>
     {% endif %}
     {% if AuthController.knowledge.can_add %}
-        <span class="border-top bg-app-layer-one-hover px-3 text-app-default-link-color" @click="add_entry()">
+        <span class="bg-app-layer-three-hover px-3 text-app-default-link-color dropdown-item" @click="add_entry()">
             <i class="bi bi-plus pe-1"></i>
             Add Entry
         </span>
-        <span class="border-top bg-app-layer-one-hover px-3 text-app-default-link-color" @click="import_entry()">
+        <span class="bg-app-layer-three-hover px-3 text-app-default-link-color dropdown-item" @click="import_entry()">
             <i class="bi bi-upload pe-1">
             </i>
             Import Entry
@@ -31,7 +31,7 @@
     {% endif %}
 
     {% if AuthController.knowledge.can_delete %}
-        <span class="border-top bg-app-layer-one-hover px-3 text-app-danger" @click="delete_collection()">
+        <span class="bg-app-layer-three-hover px-3 text-app-danger dropdown-item" @click="delete_collection()">
             <i class="bi bi-trash3 pe-1"></i>
             <span>Delete Collection</span>
         </span>

django_spire/knowledge/templates/django_spire/knowledge/entry/card/context_menu_card.html

@@ -7,31 +7,31 @@
         top: y + 'px',
         left: x + 'px',
     }"
-    class="position-fixed card shadow-lg z-3 vstack cursor-pointer bg-app-layer-one"
+    class="position-fixed card shadow-lg z-3 vstack cursor-pointer bg-app-layer-one border"
     @click.away="hide_menu()"
 >
     <span class="px-2 py-1" x-text="title"></span>
 
     {% if AuthController.knowledge.can_view %}
-        <span class="border-top bg-app-layer-three-hover px-3 text-app-default-link-color" @click="view_entry()">
+        <span class="border-top bg-app-layer-three-hover px-3 text-app-default-link-color dropdown-item" @click="view_entry()">
             <i class="bi bi-eye pe-1"></i>
             <span>View</span>
         </span>
     {% endif %}
 
     {% if AuthController.knowledge.can_change %}
-        <span class="border-top bg-app-layer-three-hover px-3 text-app-default-link-color" @click="edit_entry()">
+        <span class="bg-app-layer-three-hover px-3 text-app-default-link-color dropdown-item" @click="edit_entry()">
             <i class="bi bi-input-cursor-text pe-1"></i>
             <span>Rename</span>
         </span>
-        <span class="border-top bg-app-layer-three-hover px-3 text-app-default-link-color" @click="edit_entry_version()">
+        <span class="bg-app-layer-three-hover px-3 text-app-default-link-color dropdown-item" @click="edit_entry_version()">
             <i class="bi bi-pencil pe-1"></i>
             <span>Edit</span>
         </span>
     {% endif %}
 
     {% if AuthController.knowledge.can_delete %}
-        <span class="border-top bg-app-layer-three-hover px-3 text-app-danger" @click="delete_entry()">
+        <span class="bg-app-layer-three-hover px-3 text-app-danger dropdown-item" @click="delete_entry()">
             <i class="bi bi-trash3 pe-1"></i>
             <span>Delete</span>
         </span>

django_spire/knowledge/templates/django_spire/knowledge/entry/version/block/dropdown/add_dropdown.html

@@ -12,6 +12,7 @@
 {% block dropdown_content %}
     {% for block_type in block_types %}
         <div
+            class="bg-app-layer-one bg-app-layer-three-hover dropdown-item"
             x-data="{
                 create_block() {
                     create_blank_block({block_type: '{{ block_type.value }}', order: version_block.order + 1})

django_spire/notification/app/templates/django_spire/notification/app/dropdown/notification_dropdown.html

@@ -32,7 +32,7 @@
     class="position-relative">
         <span @click='await render_dropdown()'>
             {% block notification_dropdown_trigger %}
-                <i x-bind='trigger' class="bi bi-bell-fill text-white fs-4 cursor-pointer position-absolute"></i>
+                <i x-bind='trigger' class="bi bi-bell-fill fs-4 cursor-pointer position-absolute"></i>
                 <span x-show="new_notification"  x-cloak style="width: 10px; height: 10px; top: -1px; right: -24px;" class="bg-danger rounded-circle position-absolute"></span>
             {% endblock  %}
         </span>

django_spire/notification/app/templates/django_spire/notification/app/dropdown/notification_dropdown_content.html

@@ -2,14 +2,17 @@
     :style="window.innerWidth < 768
     ? 'width: 350px; position: fixed; top: 5%; left: 50%; transform: translateX(-50%);'
     : 'width: 350px'"
-    class="container border rounded-2"
+    class="container border rounded-2 bg-app-layer-two"
 >
     <div class="col-12 w-100">
-        <h6 class="mt-2 ms-2 text-app-secondary text-center">Notifications</h6>
+        <h6 class="mt-2 ms-2 text-center">Notifications</h6>
         <hr class="m-0">
     </div>
 
-    <div style="max-height: 300px !important; overflow-x: hidden !important; overflow-y: scroll !important;" class="text-start">
+    <div
+        style="max-height: 300px !important;"
+        class="text-start overflow-y-scroll overflow-x-hidden"
+    >
         {% for app_notification in app_notification_list %}
             <div class="col-12">
                 {% include app_notification.template %}

django_spire/settings.py

@@ -1,5 +1,6 @@
 DJANGO_SPIRE_AUTH_CONTROLLERS = {
     'ai_chat': 'django_spire.ai.chat.auth.controller.BaseAiChatAuthController',
+    'help_desk': 'django_spire.help_desk.auth.controller.BaseHelpDeskAuthController',
     'knowledge': 'django_spire.knowledge.auth.controller.BaseKnowledgeAuthController',
 }
 

django_spire/theme/templates/django_spire/theme/card/colors_preview_card.html

@@ -22,19 +22,19 @@
     <div class="preview-sample">
         <div class="d-flex flex-wrap">
             <!-- Primary colors -->
-            <div class="p-2 m-1 bg-app-primary text-white" style="width: 40px; height: 40px;"></div>
-            <div class="p-2 m-1 bg-app-primary-soft text-dark" style="width: 40px; height: 40px;"></div>
-            <div class="p-2 m-1 bg-app-primary-dark text-white" style="width: 40px; height: 40px;"></div>
+            <div class="p-2 m-1 bg-app-primary" style="width: 40px; height: 40px;"></div>
+            <div class="p-2 m-1 bg-app-primary-soft" style="width: 40px; height: 40px;"></div>
+            <div class="p-2 m-1 bg-app-primary-dark" style="width: 40px; height: 40px;"></div>
 
             <!-- Secondary colors -->
-            <div class="p-2 m-1 bg-app-secondary text-white" style="width: 40px; height: 40px;"></div>
-            <div class="p-2 m-1 bg-app-secondary-soft text-dark" style="width: 40px; height: 40px;"></div>
-            <div class="p-2 m-1 bg-app-secondary-dark text-white" style="width: 40px; height: 40px;"></div>
+            <div class="p-2 m-1 bg-app-secondary" style="width: 40px; height: 40px;"></div>
+            <div class="p-2 m-1 bg-app-secondary-soft" style="width: 40px; height: 40px;"></div>
+            <div class="p-2 m-1 bg-app-secondary-dark" style="width: 40px; height: 40px;"></div>
 
             <!-- Accent colors -->
-            <div class="p-2 m-1 bg-app-accent text-white" style="width: 40px; height: 40px;"></div>
-            <div class="p-2 m-1 bg-app-accent-soft text-dark" style="width: 40px; height: 40px;"></div>
-            <div class="p-2 m-1 bg-app-accent-dark text-white" style="width: 40px; height: 40px;"></div>
+            <div class="p-2 m-1 bg-app-accent" style="width: 40px; height: 40px;"></div>
+            <div class="p-2 m-1 bg-app-accent-soft" style="width: 40px; height: 40px;"></div>
+            <div class="p-2 m-1 bg-app-accent-dark" style="width: 40px; height: 40px;"></div>
         </div>
     </div>
 {% endblock %}

django_spire/theme/templates/django_spire/theme/card/example_preview_card.html

@@ -24,11 +24,11 @@
         </div>
         <div class="col text-center">
             {% include 'django_spire/element/attribute_element.html' with attribute_title='Dropdown' %}
-            {% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url='#' edit_url='#' delete_url='#' %}
+            {% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url='#' edit_url='#' delete_url='#' link_css='text-start' %}
         </div>
         <div class="col text-center">
             {% include 'django_spire/element/attribute_element.html' with attribute_title='Modal' %}
-            {% include 'django_spire/dropdown/ellipsis_modal_dropdown.html' with view_url='#' edit_url='#' delete_url='#' %}
+            {% include 'django_spire/dropdown/ellipsis_modal_dropdown.html' with view_url='#' edit_url='#' delete_url='#' link_css='text-start' %}
         </div>
     </div>
 {% endblock %}

django_spire/theme/templates/django_spire/theme/card/preview_card.html

@@ -8,7 +8,7 @@
 
 {% block card_button %}
     {% if card_link %}
-        <a href="{{ card_link }}" class="btn btn-sm btn-primary">
+        <a href="{{ card_link }}" class="btn btn-sm btn-app-primary">
             <i class="bi bi-eye me-1"></i> View Full Preview
         </a>
     {% endif %}
@@ -19,17 +19,17 @@
         {% if card_icon %}
             <i class="{{ card_icon }} fs-1 mb-3 text-app-{{ card_color|default:"primary" }}"></i>
         {% endif %}
-        
+
         <h5 class="mb-3">{{ card_subtitle|default:"" }}</h5>
-        
+
         <div class="mb-3">
             {{ card_description|default:"" }}
         </div>
-        
+
         {% if card_preview_content %}
-            <div class="preview-sample border p-3 rounded bg-app-light">
+            <div class="preview-sample border p-3 rounded">
                 {{ card_preview_content }}
             </div>
         {% endif %}
     </div>
-{% endblock %}
+{% endblock %}

django_spire/theme/templates/django_spire/theme/example/item/example_item.html

@@ -16,10 +16,10 @@
     </div>
     <div class="col-2 text-center">
         {% include 'django_spire/element/attribute_element.html' with attribute_title='Dropdown' %}
-        {% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url='#' edit_url='#' delete_url='#' %}
+        {% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url='#' edit_url='#' delete_url='#' link_css='text-start' %}
     </div>
     <div class="col-1 text-center">
         {% include 'django_spire/element/attribute_element.html' with attribute_title='Modal' %}
-        {% include 'django_spire/dropdown/ellipsis_modal_dropdown.html' with view_url='#' edit_url='#' delete_url='#' %}
+        {% include 'django_spire/dropdown/ellipsis_modal_dropdown.html' with view_url='#' edit_url='#' delete_url='#' link_css='text-start' %}
     </div>
 {% endblock %}

django_spire/theme/templates/django_spire/theme/section/badge_section.html

@@ -31,7 +31,7 @@
             <span class="badge bg-app-primary rounded-0">Square Badge</span>
             <span class="badge bg-app-secondary rounded-1">Slightly Rounded</span>
             <span class="badge bg-app-success rounded">Default Rounded</span>
-            <span class="badge bg-app-warning rounded-pill text-dark">Pill Badge</span>
+            <span class="badge bg-app-warning rounded-pill">Pill Badge</span>
         </div>
     </div>
 </div>
@@ -40,7 +40,7 @@
         <h5>Badge with Icons</h5>
         <div class="mb-3">
             <span class="badge bg-app-primary"><i class="bi bi-check me-1"></i>Completed</span>
-            <span class="badge bg-app-warning text-dark"><i class="bi bi-clock me-1"></i>Pending</span>
+            <span class="badge bg-app-warning"><i class="bi bi-clock me-1"></i>Pending</span>
             <span class="badge bg-app-danger"><i class="bi bi-x-circle me-1"></i>Failed</span>
         </div>
     </div>
@@ -49,8 +49,8 @@
         <div class="mb-3">
             <h6>Status Indicators <span class="badge bg-app-success">Active</span></h6>
             <p>Notification <span class="badge bg-app-danger rounded-pill">New</span></p>
-            <button type="button" class="btn btn-primary">
-                Messages <span class="badge bg-app-light text-dark">4</span>
+            <button type="button" class="btn btn-app-primary">
+                Messages <span class="badge">4</span>
             </button>
         </div>
     </div>