extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-19 04:06:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

more refactoring (rename to get_assignable_users)

Browse Source
This commit is contained in:
Benbb96
2025-08-06 00:10:06 +02:00
parent 901f2c176e
commit 50c071adb1
6 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
helpdesk/forms.py
View File

@@ -19,7 +19,7 @@ from helpdesk.lib import (
convert_value,
process_attachments,
safe_template_context,
get_active_users,
get_assignable_users,
)
from helpdesk.models import (
Checklist,
@@ -478,7 +478,10 @@ class TicketForm(AbstractTicketForm):
self.fields["queue"].choices = queue_choices
self.fields["body"].required = body_reqd
self.fields["assigned_to"].choices = [("", "--------")] + [
(u.id, u.get_username()) for u in get_active_users()
(u.id, u.get_username())
for u in get_assignable_users(
helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS
)
]
self._add_form_custom_fields()
@@ -635,13 +638,9 @@ class TicketCCForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super(TicketCCForm, self).__init__(*args, **kwargs)
if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_CC:
users = User.objects.filter(is_active=True, is_staff=True).order_by(
User.USERNAME_FIELD
self.fields["user"].queryset = get_assignable_users(
helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_CC
)
else:
users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD)
self.fields["user"].queryset = users
class TicketCCUserForm(forms.ModelForm):
@@ -649,13 +648,9 @@ class TicketCCUserForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super(TicketCCUserForm, self).__init__(*args, **kwargs)
if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_CC:
users = User.objects.filter(is_active=True, is_staff=True).order_by(
User.USERNAME_FIELD
self.fields["user"].queryset = get_assignable_users(
helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_CC
)
else:
users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD)
self.fields["user"].queryset = users
class Meta:
model = TicketCC

8
helpdesk/lib.py
View File

@@ -284,10 +284,10 @@ def daily_time_spent_calculation(earliest, latest, open_hours):
return time_spent_seconds
def get_active_users() -> QuerySet:
users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD)
def get_assignable_users(filter_staff: bool) -> QuerySet:
users = User.objects.filter(is_active=True)
if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS:
if filter_staff:
users = users.filter(is_staff=True)
return users
return users.order_by(User.USERNAME_FIELD)

2
helpdesk/templates/helpdesk/filters/owner.html
View File

@@ -12,7 +12,7 @@
{% trans "Unassigned" %}
</option>
{% endwith %}
{% for u in user_choices %}
{% for u in assignable_users %}
<option value='{{ u.id }}'{% if u.id|in_list:query_params.filtering.assigned_to__id__in %} selected='selected'{% endif %}>
{{ u.get_username }}
</option>

9
helpdesk/templates/helpdesk/ticket.html
View File

@@ -159,7 +159,14 @@
<dd><input type='text' name='title' value='{{ ticket.title|escape }}' /></dd>
<dt><label for='id_owner'>{% trans "Owner" %}</label></dt>
<dd><select id='id_owner' name='owner'><option value='0'>{% trans "Unassign" %}</option>{% for u in active_users %}{% if u.id == ticket.assigned_to.id %}<option value='{{ u.id }}' selected>{{ u }}</option>{% else %}<option value='{{ u.id }}'>{{ u }}</option>{% endif %}{% endfor %}</select></dd>
<dd>
<select id='id_owner' name='owner'>
<option value='0'>{% trans "Unassign" %}</option>
{% for u in assignable_users %}
<option value='{{ u.id }}'{% if u.id == ticket.assigned_to.id %} selected{% endif %}>{{ u }}</option>
{% endfor %}
</select>
</dd>
<dt><label for='id_priority'>{% trans "Priority" %}</label></dt>
<dd><select id='id_priority' name='priority'>{% for p in priorities %}{% if p.0 == ticket.priority %}<option value='{{ p.0 }}' selected='selected'>{{ p.1 }}</option>{% else %}<option value='{{ p.0 }}'>{{ p.1 }}</option>{% endif %}{% endfor %}</select></dd>

2
helpdesk/templates/helpdesk/ticket_list.html
View File

@@ -111,7 +111,7 @@
</optgroup>
<optgroup label='{% trans "Assign To" %}'>
<option value='unassign'>{% trans "Nobody (Unassign)" %}</option>
{% for u in user_choices %}
{% for u in assignable_users %}
<option value='assign_{{ u.id }}'>{{ u.get_username }}</option>
{% endfor %}
</optgroup>

14
helpdesk/views/staff.py
View File

@@ -56,7 +56,11 @@ from helpdesk.forms import (
TicketResolvesForm,
UserSettingsForm,
)
from helpdesk.lib import queue_template_context, safe_template_context, get_active_users
from helpdesk.lib import (
queue_template_context,
safe_template_context,
get_assignable_users,
)
from helpdesk.models import (
Checklist,
ChecklistTask,
@@ -133,7 +137,9 @@ def get_user_queues(user) -> dict[str, str]:
def get_form_extra_kwargs(user) -> dict[str, object]:
return {
"active_users": get_active_users(),
"assignable_users": get_assignable_users(
helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS
),
"queues": get_user_queues(user),
"priorities": Ticket.PRIORITY_CHOICES,
}
@@ -1177,7 +1183,9 @@ def ticket_list(request):
dict(
context,
default_tickets_per_page=request.user.usersettings_helpdesk.tickets_per_page,
user_choices=User.objects.filter(is_active=True, is_staff=True),
assignable_users=get_assignable_users(
helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS
),
kb_items=kbitem,
queue_choices=huser.get_queues(),
status_choices=Ticket.STATUS_CHOICES,