Bloomerp 1.0.0.dev27__tar.gz → 1.0.0.dev29__tar.gz

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/Bloomerp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Bloomerp
-Version: 1.0.0.dev27
+Version: 1.0.0.dev29
 Summary: Bloomerp is an open-source Business Management Software framework that lets you create fully functional business management applications just by defining your Django database models.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -552,7 +552,7 @@ Suppose we want to send an email to a specific employee or customer without sele
 In `views.py`:
 
 ```python
-from bloomerp.views.detail import BloomerpBaseDetailView
+from bloomerp.views.detail import BaseBloomerpDetailView
 
 @router.bloomerp_route(
     path='send-email',  # Becomes /employees/{pk}/send-email & /customers/{pk}/send-email
@@ -562,7 +562,7 @@ from bloomerp.views.detail import BloomerpBaseDetailView
     url_name='send_email',  # Becomes employees_detail_send_email & customers_detail_send_email
     models=[Employee, Customer],
 )
-class SendEmailView(BloomerpBaseDetailView):
+class SendEmailView(BaseBloomerpDetailView):
     template_name = 'send_email.html'
     model: BloomerpModel = None
 
@@ -595,7 +595,7 @@ Create the HTML template `send_email.html`:
 </form>
 ```
 
-Since we inherited from `BloomerpBaseDetailView`, all necessary context data (like `object`, `model`, and more) is already included.
+Since we inherited from `BaseBloomerpDetailView`, all necessary context data (like `object`, `model`, and more) is already included.
 
 This will produce the following result:
 

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/Bloomerp.egg-info/SOURCES.txt

@@ -778,6 +778,7 @@ bloomerp/utils/requests.py
 bloomerp/utils/sql.py
 bloomerp/utils/urls.py
 bloomerp/views/__init__.py
+bloomerp/views/base.py
 bloomerp/views/access_control/manage_permissions.py
 bloomerp/views/access_control/policy_list.py
 bloomerp/views/access_control/update.py
@@ -793,7 +794,6 @@ bloomerp/views/core/__init__.py
 bloomerp/views/core/bookmarks.py
 bloomerp/views/core/bulk_upload.py
 bloomerp/views/core/create_view.py
-bloomerp/views/core/delete_view.py
 bloomerp/views/core/detail_comments.py
 bloomerp/views/core/file_list.py
 bloomerp/views/core/list_view.py
@@ -820,7 +820,6 @@ bloomerp/views/mixins/model_form_view_mixin.py
 bloomerp/views/mixins/wizard_mixin.py
 bloomerp/views/user/__init__.py
 bloomerp/views/user/admin_reset_password.py
-bloomerp/views/user/base.py
 bloomerp/views/user/create_user.py
 bloomerp/views/user/inbox.py
 bloomerp/views/user/profile.py

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Bloomerp
-Version: 1.0.0.dev27
+Version: 1.0.0.dev29
 Summary: Bloomerp is an open-source Business Management Software framework that lets you create fully functional business management applications just by defining your Django database models.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -552,7 +552,7 @@ Suppose we want to send an email to a specific employee or customer without sele
 In `views.py`:
 
 ```python
-from bloomerp.views.detail import BloomerpBaseDetailView
+from bloomerp.views.detail import BaseBloomerpDetailView
 
 @router.bloomerp_route(
     path='send-email',  # Becomes /employees/{pk}/send-email & /customers/{pk}/send-email
@@ -562,7 +562,7 @@ from bloomerp.views.detail import BloomerpBaseDetailView
     url_name='send_email',  # Becomes employees_detail_send_email & customers_detail_send_email
     models=[Employee, Customer],
 )
-class SendEmailView(BloomerpBaseDetailView):
+class SendEmailView(BaseBloomerpDetailView):
     template_name = 'send_email.html'
     model: BloomerpModel = None
 
@@ -595,7 +595,7 @@ Create the HTML template `send_email.html`:
 </form>
 ```
 
-Since we inherited from `BloomerpBaseDetailView`, all necessary context data (like `object`, `model`, and more) is already included.
+Since we inherited from `BaseBloomerpDetailView`, all necessary context data (like `object`, `model`, and more) is already included.
 
 This will produce the following result:
 

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/README.md

@@ -398,7 +398,7 @@ Suppose we want to send an email to a specific employee or customer without sele
 In `views.py`:
 
 ```python
-from bloomerp.views.detail import BloomerpBaseDetailView
+from bloomerp.views.detail import BaseBloomerpDetailView
 
 @router.bloomerp_route(
     path='send-email',  # Becomes /employees/{pk}/send-email & /customers/{pk}/send-email
@@ -408,7 +408,7 @@ from bloomerp.views.detail import BloomerpBaseDetailView
     url_name='send_email',  # Becomes employees_detail_send_email & customers_detail_send_email
     models=[Employee, Customer],
 )
-class SendEmailView(BloomerpBaseDetailView):
+class SendEmailView(BaseBloomerpDetailView):
     template_name = 'send_email.html'
     model: BloomerpModel = None
 
@@ -441,7 +441,7 @@ Create the HTML template `send_email.html`:
 </form>
 ```
 
-Since we inherited from `BloomerpBaseDetailView`, all necessary context data (like `object`, `model`, and more) is already included.
+Since we inherited from `BaseBloomerpDetailView`, all necessary context data (like `object`, `model`, and more) is already included.
 
 This will produce the following result:
 

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/access_control/manage_permissions.py

@@ -14,6 +14,7 @@ from bloomerp.models.access_control.policy import Policy
 from bloomerp.models.application_field import ApplicationField
 from bloomerp.router import router
 from bloomerp.serializers.access_control import PolicySerializer
+from bloomerp.views.base import BaseBloomerpView
 from bloomerp.views.mixins.conditional_staff_required_mixin import ConditionalStaffRequiredMixin
 from bloomerp.views.mixins.htmx_mixin import HtmxMixin
 from bloomerp.views.mixins.wizard_mixin import BaseStateOrchestrator, WizardMixin, WizardStep
@@ -267,7 +268,7 @@ def pcs_policy_details(request: HttpRequest, view, orchestrator: BaseStateOrches
     name="Create Policy for {model}",
     description="Create an access control policies for {model}",
 )
-class ManageAccessControlForModelView(ConditionalStaffRequiredMixin, UserPassesTestMixin, WizardMixin, HtmxMixin, TemplateView):
+class ManageAccessControlForModelView(BaseBloomerpView, WizardMixin, TemplateView):
     template_name = "base_wizard.html"
     model: type[Model] = None
 
@@ -362,5 +363,5 @@ class ManageAccessControlForModelView(ConditionalStaffRequiredMixin, UserPassesT
             return HttpResponseClientRedirect(policy.get_absolute_url())
         return redirect(policy.get_absolute_url())
 
-    def test_func(self):
+    def has_permission(self):
         return self.request.user.is_superuser

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/access_control/policy_list.py

@@ -1,5 +1,6 @@
 from bloomerp.router import router
 from django.views.generic import TemplateView
+from bloomerp.views.base import BaseBloomerpView
 from bloomerp.views.mixins.htmx_mixin import HtmxMixin
 from django.db.models import Model
 from django.contrib.contenttypes.models import ContentType
@@ -13,7 +14,7 @@ from bloomerp.views.mixins.conditional_staff_required_mixin import ConditionalSt
     route_type='model',
     models='__all__',
 )
-class ManageAccessControlForModelView(ConditionalStaffRequiredMixin, UserPassesTestMixin, HtmxMixin, TemplateView):
+class ManageAccessControlForModelView(BaseBloomerpView, TemplateView):
     template_name = "access_control_views/policy_list.html"
     model : Model = None
     
@@ -33,5 +34,5 @@ class ManageAccessControlForModelView(ConditionalStaffRequiredMixin, UserPassesT
         return context
     
 
-    def test_func(self):
+    def has_permission(self):
         return self.request.user.is_superuser

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/access_control/update.py

@@ -5,6 +5,7 @@ same mechanism as the create view, but with the data pre-filled.
 A lot of the logic is therefore reused.
 """
 
+from django.shortcuts import get_object_or_404
 from django.contrib.contenttypes.models import ContentType
 
 from bloomerp.models.access_control.policy import Policy
@@ -19,7 +20,6 @@ from bloomerp.views.access_control.manage_permissions import (
     ROW_POLICY_RULES_KEY,
     ManageAccessControlForModelView,
 )
-from bloomerp.views.detail.base_detail import BloomerpBaseDetailView
 
 @router.register(
     path="update",
@@ -28,9 +28,12 @@ from bloomerp.views.detail.base_detail import BloomerpBaseDetailView
     route_type="detail",
     models=Policy,
 )
-class UpdatePolicyView(ManageAccessControlForModelView, BloomerpBaseDetailView):
+class UpdatePolicyView(ManageAccessControlForModelView):
     model = Policy
 
+    def get_object(self) -> Policy:
+        return get_object_or_404(self.model, pk=self.kwargs["pk"])
+
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
         self.object : Policy = self.get_object()

bloomerp-1.0.0.dev29/bloomerp/views/base.py

@@ -0,0 +1,14 @@
+
+
+from bloomerp.views.mixins.conditional_staff_required_mixin import ConditionalStaffRequiredMixin
+from bloomerp.views.mixins.htmx_mixin import HtmxMixin
+from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
+
+class BaseBloomerpView(
+    ConditionalStaffRequiredMixin,
+    LoginRequiredMixin,
+    PermissionRequiredMixin,
+    HtmxMixin,
+):
+    def has_permission(self):
+        return True # Override in subclasses as needed

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/core/__init__.py

@@ -1,21 +1,19 @@
 from bloomerp.router import router
-from ..detail.base_detail import BloomerpBaseDetailView
+from ..detail.base_detail import BaseBloomerpDetailView
 from .list_view import BloomerpListView
 from .create_view import BloomerpCreateView
 from ..detail.files import BloomerpDetailFileListView
 from .bulk_upload import BloomerpBulkUploadView
 from .file_list import BloomerpFileListView
 from ..detail.comments import BloomerpDetailCommentsView
-from .bookmarks import BloomerpBookmarksView
 
 __all__ = [
     "router",
-    "BloomerpBaseDetailView",
+    "BaseBloomerpDetailView",
     "BloomerpListView",
     "BloomerpCreateView",
     "BloomerpDetailFileListView",
     "BloomerpBulkUploadView",
     "BloomerpFileListView",
     "BloomerpDetailCommentsView",
-    "BloomerpBookmarksView",
 ]

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/core/bulk_upload.py

@@ -15,6 +15,7 @@ from bloomerp.services.bulk_services import (
     BulkCrudService,
 )
 from bloomerp.services.permission_services import UserPermissionManager, create_permission_str
+from bloomerp.views.base import BaseBloomerpView
 from bloomerp.views.mixins.conditional_staff_required_mixin import ConditionalStaffRequiredMixin
 from bloomerp.views.mixins.htmx_mixin import HtmxMixin
 from bloomerp.views.mixins.wizard_mixin import BaseStateOrchestrator, WizardMixin, WizardStep
@@ -203,7 +204,7 @@ def ctx_confirm_step(request: HttpRequest, view:"BloomerpBulkUploadView", orches
     route_type="model",
     exclude_models=[File],
 )
-class BloomerpBulkUploadView(PermissionRequiredMixin, ConditionalStaffRequiredMixin, WizardMixin, HtmxMixin, TemplateView):
+class BloomerpBulkUploadView(BaseBloomerpView, WizardMixin, TemplateView):
     model = None
     module = None
     state_orchestrator_cls = BaseStateOrchestrator

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/core/create_view.py

@@ -22,6 +22,7 @@ from bloomerp.services.create_view_services import (
 )
 from bloomerp.services.permission_services import UserPermissionManager, create_permission_str
 from bloomerp.utils.models import get_detail_view_url
+from bloomerp.views.base import BaseBloomerpView
 from bloomerp.views.mixins.conditional_staff_required_mixin import ConditionalStaffRequiredMixin
 from bloomerp.views.mixins.model_form_view_mixin import BloomerpModelFormViewMixin
 from bloomerp.views.mixins.htmx_mixin import HtmxMixin
@@ -40,10 +41,8 @@ User = get_user_model()
     exclude_models=[File, Tile, SqlQuery, User, Workspace],
 )
 class BloomerpCreateView(
-    ConditionalStaffRequiredMixin,
-    PermissionRequiredMixin,
+    BaseBloomerpView,
     SuccessMessageMixin,
-    HtmxMixin,
     BloomerpModelFormViewMixin,
     BloomerpLayoutFormMixin,
     CreateView,

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/core/detail_comments.py

@@ -1,6 +1,6 @@
 from bloomerp.models.communication import Comment
 from bloomerp.router import router
-from bloomerp.views.detail.base_detail import BloomerpBaseDetailView
+from bloomerp.views.detail.base_detail import BaseBloomerpDetailView
 
 
 @router.register(
@@ -11,7 +11,7 @@ from bloomerp.views.detail.base_detail import BloomerpBaseDetailView
     route_type="detail",
     models="__all__",
 )
-class BloomerpDetailCommentsView(BloomerpBaseDetailView):
+class BloomerpDetailCommentsView(BaseBloomerpDetailView):
     template_name = "detail_views/bloomerp_detail_comments_view.html"
     model = None
     permissions = ["view"]

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/core/file_list.py

@@ -5,6 +5,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from bloomerp.models.application_field import ApplicationField
 from bloomerp.models.files import File
+from bloomerp.views.base import BaseBloomerpView
 from bloomerp.views.mixins.htmx_mixin import HtmxMixin
 from bloomerp.router import router
 
@@ -16,7 +17,7 @@ from bloomerp.router import router
     url_name="app",
     description="List of all files across the application.",
 )
-class BloomerpFileListView(PermissionRequiredMixin, HtmxMixin, TemplateView):
+class BloomerpFileListView(BaseBloomerpView, TemplateView):
     template_name = "list_views/bloomerp_file_list_view.html"
     model = File
     module = None

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/core/list_view.py

@@ -1,9 +1,10 @@
 from typing import Any
 from django.db.models import Model
-from django.views.generic.list import ListView
+from django.views.generic import TemplateView
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from bloomerp.models.files import File
 from bloomerp.services.permission_services import UserPermissionManager, create_permission_str
+from bloomerp.views.base import BaseBloomerpView
 from bloomerp.views.mixins.model_context_mixin import BloomerpModelContextMixin
 from bloomerp.router import router
 from bloomerp.views.mixins.htmx_mixin import HtmxMixin
@@ -17,7 +18,7 @@ from bloomerp.views.mixins.htmx_mixin import HtmxMixin
     route_type="model",
     exclude_models=[File],
 )
-class BloomerpListView(PermissionRequiredMixin, BloomerpModelContextMixin, HtmxMixin, ListView):
+class BloomerpListView(BaseBloomerpView, BloomerpModelContextMixin, TemplateView):
     model: Model = None
     module = None
     template_name: str = "list_views/bloomerp_list_view.html"

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/detail/access_control.py

@@ -3,7 +3,7 @@ A view that shows which users have access to the particular object.
 """
 
 from bloomerp.router import router
-from bloomerp.views.detail.base_detail import BloomerpBaseDetailView
+from bloomerp.views.detail.base_detail import BaseBloomerpDetailView
 from django.contrib.auth.mixins import PermissionRequiredMixin
 
 # @router.register(
@@ -13,6 +13,6 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
 #     description="Check which objects have access to this particular object",
 #     models="__all__"
 # )
-# class BloomerpDetailOverviewView(BloomerpBaseDetailView):
+# class BloomerpDetailOverviewView(BaseBloomerpDetailView):
 #     template_name = "detail_views/bloomerp_detail_access_control_view.html"
 

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/detail/activity_log.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict
 from bloomerp.router import router
-from bloomerp.views.detail.base_detail import BloomerpBaseDetailView
+from bloomerp.views.detail.base_detail import BaseBloomerpDetailView
 from bloomerp.models.activity_log import ActivityLog
 
 # @router.register(
@@ -11,7 +11,7 @@ from bloomerp.models.activity_log import ActivityLog
 #     route_type="detail",
 #     models="__all__",
 # )
-# class BloomerpDetailActivityView(BloomerpBaseDetailView):
+# class BloomerpDetailActivityView(BaseBloomerpDetailView):
 #     template_name = "detail_views/bloomerp_detail_activity_view.html"
     
 #     def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/detail/base_detail.py

@@ -2,6 +2,7 @@ from typing import Any
 from django.views.generic.detail import DetailView
 from bloomerp.models.application_field import ApplicationField
 from bloomerp.services.permission_services import UserPermissionManager, create_permission_str
+from bloomerp.views.base import BaseBloomerpView
 from bloomerp.views.mixins.conditional_staff_required_mixin import ConditionalStaffRequiredMixin
 from bloomerp.views.mixins.model_context_mixin import BloomerpModelContextMixin
 from bloomerp.router import router
@@ -12,7 +13,7 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
 
 from bloomerp.views.mixins.htmx_mixin import HtmxMixin
 
-class BloomerpBaseDetailView(HtmxMixin, ConditionalStaffRequiredMixin, PermissionRequiredMixin, BloomerpModelContextMixin, DetailView):
+class BaseBloomerpDetailView(BaseBloomerpView, BloomerpModelContextMixin, DetailView):
     htmx_template = "bloomerp_htmx_base_view.html"
     tabs = None
     exclude_header = False

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/detail/comments.py

@@ -1,5 +1,5 @@
 from bloomerp.models.communication import Comment
-from .base_detail import BloomerpBaseDetailView
+from .base_detail import BaseBloomerpDetailView
 from bloomerp.router import router
 
 
@@ -11,7 +11,7 @@ from bloomerp.router import router
     route_type="detail",
     models="__all__",
 )
-class BloomerpDetailCommentsView(BloomerpBaseDetailView):
+class BloomerpDetailCommentsView(BaseBloomerpDetailView):
     template_name = "detail_views/bloomerp_detail_comments_view.html"
     model = None
     

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/detail/delete_view.py

@@ -15,7 +15,7 @@ from bloomerp.services.permission_services import UserPermissionManager
 from bloomerp.services.permission_services import create_permission_str
 from bloomerp.utils.models import get_delete_view_url
 from bloomerp.utils.models import get_list_view_url
-from bloomerp.views.detail.base_detail import BloomerpBaseDetailView
+from bloomerp.views.detail.base_detail import BaseBloomerpDetailView
 
 
 User = get_user_model()
@@ -30,7 +30,7 @@ User = get_user_model()
     route_type="detail",
     exclude_models=[File, Tile, SqlQuery, User],
 )
-class BloomerpDeleteView(BloomerpBaseDetailView):
+class BloomerpDeleteView(BaseBloomerpDetailView):
     template_name = "delete_views/bloomerp_delete_view.html"
 
     def get_delete_permission(self) -> str:

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/detail/files.py

@@ -1,7 +1,7 @@
 
 from bloomerp.models.files import File
 from django.urls import reverse
-from .base_detail import BloomerpBaseDetailView
+from .base_detail import BaseBloomerpDetailView
 from bloomerp.router import router
 from bloomerp.services.file_services import ensure_folder_hierarchy_for_object
 
@@ -13,7 +13,7 @@ from bloomerp.services.file_services import ensure_folder_hierarchy_for_object
     route_type="detail",
     exclude_models=[File],
 )
-class BloomerpDetailFileListView(BloomerpBaseDetailView):
+class BloomerpDetailFileListView(BaseBloomerpDetailView):
     template_name = "detail_views/bloomerp_detail_files_view.html"
     modules = None
     permission_fields = [("files", "view")]
@@ -32,6 +32,7 @@ class BloomerpDetailFileListView(BloomerpBaseDetailView):
         context["file_browser_url"] = f"{reverse('components_files')}?{params.urlencode()}"
         return context
 
+
     
 
     

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/detail/foreign_relationship.py

@@ -6,10 +6,10 @@ from bloomerp.models.communication import Comment
 from bloomerp.models.files import File
 from bloomerp.router import router
 from bloomerp.services.permission_services import UserPermissionManager, create_permission_str
-from bloomerp.views.detail.base_detail import BloomerpBaseDetailView
+from bloomerp.views.detail.base_detail import BaseBloomerpDetailView
 from django.contrib.contenttypes.models import ContentType
 
-class ForeignRelationshipView(BloomerpBaseDetailView):
+class ForeignRelationshipView(BaseBloomerpDetailView):
     template_name: str = "detail_views/bloomerp_foreign_relationship_view.html"
     model = None
     related_model = None 

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/detail/overview.py

@@ -13,7 +13,7 @@ from bloomerp.services.create_view_services import AUTO_MANAGED_FIELD_NAMES, get
 from bloomerp.services.detail_view_services import get_default_layout
 from bloomerp.services.permission_services import UserPermissionManager, create_permission_str
 from bloomerp.utils.models import get_detail_view_url
-from bloomerp.views.detail.base_detail import BloomerpBaseDetailView
+from bloomerp.views.detail.base_detail import BaseBloomerpDetailView
 from bloomerp.views.mixins.layout_form_mixin import BloomerpLayoutFormMixin
 
 
@@ -25,7 +25,7 @@ from bloomerp.views.mixins.layout_form_mixin import BloomerpLayoutFormMixin
     route_type="detail",
     models="__all__",
 )
-class BloomerpDetailOverviewView(BloomerpLayoutFormMixin, BloomerpBaseDetailView):
+class BloomerpDetailOverviewView(BloomerpLayoutFormMixin, BaseBloomerpDetailView):
     template_name = "mixins/bloomerp_layout_form_mixin.html"
     settings = None
     layout_mode = "detail"

bloomerp-1.0.0.dev29/bloomerp/views/document_templates/__init__.py

@@ -0,0 +1 @@
+EXCLUDE_MODELS = []

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/document_templates/document_template_editor.py

@@ -1,6 +1,6 @@
 from bloomerp.models.document_templates import DocumentTemplate
 from bloomerp.router import router
-from bloomerp.views.core import BloomerpBaseDetailView
+from bloomerp.views.core import BaseBloomerpDetailView
 
 
 from django.views.generic.edit import UpdateView
@@ -14,7 +14,7 @@ from django.views.generic.edit import UpdateView
     url_name="editor",
     description="Document Template Editor"
     )
-class BloomerpDocumentTemplateEditorView(BloomerpBaseDetailView, UpdateView):
+class BloomerpDocumentTemplateEditorView(BaseBloomerpDetailView, UpdateView):
     model = DocumentTemplate
     template_name = "document_template_views/bloomerp_document_template_editor_view.html"
     fields = ["template"]

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/document_templates/generate_document_template.py

@@ -1,7 +1,7 @@
 from bloomerp.forms.document_templates import GenerateDocumentForm
 from bloomerp.models.document_templates import DocumentTemplate
 from bloomerp.router import router
-from bloomerp.views.core import BloomerpBaseDetailView
+from bloomerp.views.core import BaseBloomerpDetailView
 
 
 @router.register(
@@ -12,7 +12,7 @@ from bloomerp.views.core import BloomerpBaseDetailView
     url_name="generate_document",
     description="Generate document for the document template"
     )
-class BloomerpDocumentTemplateGenerateView(BloomerpBaseDetailView):
+class BloomerpDocumentTemplateGenerateView(BaseBloomerpDetailView):
     model = DocumentTemplate
     template_name = "document_template_views/bloomerp_document_template_generate_view.html"
 

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/document_templates/generate_document_template_for_model.py

@@ -3,7 +3,7 @@ from bloomerp.models.document_templates import DocumentTemplate
 from bloomerp.models.files import File
 from bloomerp.router import router
 from bloomerp.utils.document_templates import DocumentController
-from bloomerp.views.core import BloomerpBaseDetailView
+from bloomerp.views.core import BaseBloomerpDetailView
 from bloomerp.views.document_templates import EXCLUDE_MODELS
 
 
@@ -20,7 +20,7 @@ from django.shortcuts import redirect
     description="Document Template for {model}",
     exclude_models=EXCLUDE_MODELS
     )
-class BloomerpDetailDocumentTemplateGenerateView(BloomerpBaseDetailView):
+class BloomerpDetailDocumentTemplateGenerateView(BaseBloomerpDetailView):
     template_name = "document_template_views/bloomerp_detail_document_generator_view.html"
     model = None
 

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/document_templates/generated_document_template_list.py

@@ -1,7 +1,7 @@
 from bloomerp.models.document_templates import DocumentTemplate
 from bloomerp.models.files import File
 from bloomerp.router import router
-from bloomerp.views.core import BloomerpBaseDetailView
+from bloomerp.views.core import BaseBloomerpDetailView
 
 
 @router.register(
@@ -12,7 +12,7 @@ from bloomerp.views.core import BloomerpBaseDetailView
     url_name="generated_documents",
     description="List of generated documents for the document template"
     )
-class BloomerpDocumentTemplateGeneratedDocumentsView(BloomerpBaseDetailView):
+class BloomerpDocumentTemplateGeneratedDocumentsView(BaseBloomerpDetailView):
     model = DocumentTemplate
     template_name = "document_template_views/bloomerp_document_template_generated_documents_view.html"
 

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/user/admin_reset_password.py

@@ -1,6 +1,7 @@
 from bloomerp.router import router
 from bloomerp.models.users.user import User
-from bloomerp.views.core import BloomerpBaseDetailView
+from bloomerp.views.base import BaseBloomerpView
+from bloomerp.views.core import BaseBloomerpDetailView
 
 
 from django.contrib.auth.forms import AdminPasswordChangeForm
@@ -16,11 +17,12 @@ from django.views.generic.edit import FormView
     url_name='reset_password_for_user',
     description='Reset password for a user'
 )
-class UserAdminPasswordResetView(UserPassesTestMixin, BloomerpBaseDetailView, FormView):
+class UserAdminPasswordResetView(BaseBloomerpView, FormView):
     template_name = 'auth_views/profile_password_reset.html'
     form_class = AdminPasswordChangeForm
+    model = None
 
-    def test_func(self):
+    def has_permission(self):
         return self.request.user.is_superuser
 
     def get_success_url(self):

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/user/create_user.py

@@ -1,7 +1,9 @@
 from bloomerp.forms.auth import BloomerpUserCreationForm
 from bloomerp.router import router
+from bloomerp.services.permission_services import UserPermissionManager
 from bloomerp.utils.models import model_name_plural_underline
 from bloomerp.models.users.user import User
+from bloomerp.views.base import BaseBloomerpView
 from bloomerp.views.mixins.htmx_mixin import HtmxMixin
 
 
@@ -19,11 +21,7 @@ from django.views.generic.edit import FormView
     route_type="model",
     models=User
 )
-class UserCreateView(
-        PermissionRequiredMixin,
-        SuccessMessageMixin,
-        HtmxMixin,
-        FormView):
+class UserCreateView(BaseBloomerpView, SuccessMessageMixin, FormView):
     template_name = "create_views/bloomerp_create_view.html"
     fields = None
     model = None
@@ -42,8 +40,13 @@ class UserCreateView(
         form.save()
         return super().form_valid(form)
 
-    def get_permission_required(self):
-        return [f"{self.model._meta.app_label}.add_{self.model._meta.model_name}"]
+    def has_permission(self):
+        manager = UserPermissionManager(self.request.user)
+
+        return manager.has_global_permission(
+            self.model,
+            "add_user"
+        )
 
     def get_success_message(self, cleaned_data):
         return f"User was created successfully."

{bloomerp-1.0.0.dev27 → bloomerp-1.0.0.dev29}/bloomerp/views/user/inbox.py

@@ -1,4 +1,5 @@
 from bloomerp.router import router
+from bloomerp.views.base import BaseBloomerpView
 from bloomerp.views.mixins.htmx_mixin import HtmxMixin
 from django.views.generic import TemplateView
 
@@ -10,6 +11,6 @@ from django.views.generic import TemplateView
     url_name="inbox",
     route_type="app"
 )
-class InboxView(HtmxMixin, TemplateView):
+class InboxView(BaseBloomerpView, TemplateView):
     template_name = "user_views/inbox_view.html"