extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-05-30 14:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix pycodestyle errors

Browse Source
This commit is contained in:
Timothy Hobbs 2020-01-08 20:38:08 +01:00
parent 6a8ebd56a0
commit 05bd852799
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
helpdesk/forms.py
View File

@ -180,14 +180,13 @@ class AbstractTicketForm(CustomFieldMixin, forms.Form):
def __init__(self, kbcategory=None, *args, **kwargs): def __init__(self, kbcategory=None, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
if kbcategory: if kbcategory:
self.fields['kbitem'] = forms.ChoiceField( self.fields['kbitem'] = forms.ChoiceField(
widget=forms.Select(attrs={'class': 'form-control'}), widget=forms.Select(attrs={'class': 'form-control'}),
required=False, required=False,
label=_('Knowedge Base Item'), label=_('Knowedge Base Item'),
choices=[(kbi.pk, kbi.title) for kbi in KBItem.objects.filter(category=kbcategory.pk)], choices=[(kbi.pk, kbi.title) for kbi in KBItem.objects.filter(category=kbcategory.pk)],
) )
def _add_form_custom_fields(self, staff_only_filter=None): def _add_form_custom_fields(self, staff_only_filter=None):
if staff_only_filter is None: if staff_only_filter is None:
queryset = CustomField.objects.all() queryset = CustomField.objects.all()
@ -195,8 +194,11 @@ class AbstractTicketForm(CustomFieldMixin, forms.Form):
queryset = CustomField.objects.filter(staff_only=staff_only_filter) queryset = CustomField.objects.filter(staff_only=staff_only_filter)
for field in queryset: for field in queryset:
instanceargs = { 'label': field.label, 'help_text': instanceargs = {
field.help_text, 'required': field.required, } 'label': field.label,
'help_text': field.help_text,
'required': field.required,
}
self.customfield_to_field(field, instanceargs) self.customfield_to_field(field, instanceargs)

6
helpdesk/models.py
View File

@ -1232,7 +1232,6 @@ class KBCategory(models.Model):
verbose_name=_('Default queue when creating a ticket after viewing this category.'), verbose_name=_('Default queue when creating a ticket after viewing this category.'),
) )
def __str__(self): def __str__(self):
return '%s' % self.title return '%s' % self.title
@ -1318,12 +1317,11 @@ class KBItem(models.Model):
def get_absolute_url(self): def get_absolute_url(self):
from django.urls import reverse from django.urls import reverse
return str(reverse('helpdesk:kb_category', args=(self.category.slug,)))+"?kbitem="+str(self.pk) return str(reverse('helpdesk:kb_category', args=(self.category.slug,))) + "?kbitem=" + str(self.pk)
def query_url(self): def query_url(self):
from django.urls import reverse from django.urls import reverse
return str(reverse('helpdesk:list')) +"?kbitem="+str(self.pk) return str(reverse('helpdesk:list')) + "?kbitem=" + str(self.pk)
def get_markdown(self): def get_markdown(self):
return get_markdown(self.answer) return get_markdown(self.answer)

1
helpdesk/views/abstract_views.py
View File

@ -14,7 +14,6 @@ class AbstractCreateTicketMixin():
if request.user.is_authenticated and request.user.usersettings_helpdesk.use_email_as_submitter and request.user.email: if request.user.is_authenticated and request.user.usersettings_helpdesk.use_email_as_submitter and request.user.email:
initial_data['submitter_email'] = request.user.email initial_data['submitter_email'] = request.user.email
query_param_fields = ['submitter_email', 'title', 'body', 'queue', 'kbitem'] query_param_fields = ['submitter_email', 'title', 'body', 'queue', 'kbitem']
custom_fields = ["custom_%s" % f.name for f in CustomField.objects.filter(staff_only=False)] custom_fields = ["custom_%s" % f.name for f in CustomField.objects.filter(staff_only=False)]
query_param_fields += custom_fields query_param_fields += custom_fields