mirror of
https://github.com/django-helpdesk/django-helpdesk.git
synced 2024-12-12 18:00:45 +01:00
Filter custom fields according to settings list
This commit is contained in:
parent
8eb883e19e
commit
f31f3eb233
@ -33,7 +33,8 @@ from helpdesk.settings import (
|
|||||||
CUSTOMFIELD_DATE_FORMAT,
|
CUSTOMFIELD_DATE_FORMAT,
|
||||||
CUSTOMFIELD_DATETIME_FORMAT,
|
CUSTOMFIELD_DATETIME_FORMAT,
|
||||||
CUSTOMFIELD_TIME_FORMAT,
|
CUSTOMFIELD_TIME_FORMAT,
|
||||||
CUSTOMFIELD_TO_FIELD_DICT
|
CUSTOMFIELD_TO_FIELD_DICT,
|
||||||
|
HELPDESK_SHOW_CUSTOM_FIELDS_FOLLOW_UP_LIST,
|
||||||
)
|
)
|
||||||
from helpdesk.validators import validate_file_extension
|
from helpdesk.validators import validate_file_extension
|
||||||
from helpdesk.signals import new_ticket_done
|
from helpdesk.signals import new_ticket_done
|
||||||
@ -191,7 +192,11 @@ class EditTicketCustomFieldForm(EditTicketForm):
|
|||||||
"""
|
"""
|
||||||
super(EditTicketCustomFieldForm, self).__init__(*args, **kwargs)
|
super(EditTicketCustomFieldForm, self).__init__(*args, **kwargs)
|
||||||
|
|
||||||
del self.fields['merged_to']
|
if HELPDESK_SHOW_CUSTOM_FIELDS_FOLLOW_UP_LIST:
|
||||||
|
fields = list(self.fields)
|
||||||
|
for field in fields:
|
||||||
|
if field != 'id' and field.replace("custom_", "", 1) not in HELPDESK_SHOW_CUSTOM_FIELDS_FOLLOW_UP_LIST:
|
||||||
|
self.fields.pop(field, None)
|
||||||
|
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
|
Loading…
Reference in New Issue
Block a user