Merge pull request #372 from adamspd/fix-staff-member-creation-error-if-already-created

adamspd · web-flow · commit 18b5c0df5857 · 2025-09-06T20:41:58.000+02:00
Change staff member creation to get_or_create
diff --git a/appointment/__init__.py b/appointment/__init__.py
@@ -6,5 +6,5 @@
 __url__ = "https://github.com/adamspd/django-appointment"
 __package_website__ = "https://django-appt.adamspierredavid.com/"
 __package_doc_url__ = "https://django-appt-doc.adamspierredavid.com/"
-__version__ = "3.9.2b0"
+__version__ = "3.9.3b2"
 __test_version__ = True
diff --git a/appointment/templates/administration/user_profile.html b/appointment/templates/administration/user_profile.html
@@ -7,9 +7,6 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"
           integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA=="
           crossorigin="anonymous" referrerpolicy="no-referrer"/>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.2/css/bootstrap.min.css"
-          integrity="sha512-b2QcS5SsA8tZodcDtGRELiGv5SaKSk1vDHDaQRda0htPYWZ6046lr3kJ5bAAQdpV2mmA/4v0wQF9MyU6/pDIAg=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
 {% endblock %}
 {% block title %}
     {{ page_title }}
@@ -278,4 +275,3 @@ <h2>{% trans 'Service Offered' %}</h2>
 
     <script src="{% static 'js/js-utils.js' %}"></script>
 {% endblock %}
-
diff --git a/appointment/views_admin.py b/appointment/views_admin.py
@@ -149,6 +149,7 @@ def add_working_hours(request, staff_user_id=None, response_type='html'):
     staff_user_id = staff_user_id or request.user.pk
     if not check_permissions(staff_user_id, request.user):
         message = _("You can only add your own working hours.")
+        print(f"Is staff {request.user.is_staff} ? or superuser: {request.user.is_superuser} ?")
         return handle_unauthorized_response(request, message, response_type)
     staff_user_id = staff_user_id if staff_user_id else request.user.pk
     staff_member = get_staff_member_by_user_id(user_id=staff_user_id)
@@ -434,7 +435,7 @@ def create_new_staff_member(request):
 @require_superuser
 def make_superuser_staff_member(request):
     user = request.user
-    StaffMember.objects.create(user=user)
+    StaffMember.objects.get_or_create(user=user)
     return redirect('appointment:user_profile')
 
 
