mirror of
https://github.com/django-helpdesk/django-helpdesk.git
synced 2025-08-19 04:06:23 +02:00
Fixing style (according to branch 'autocodestyle') + quicktest
This commit is contained in:
@@ -7,11 +7,7 @@ views/feeds.py - A handful of staff-only RSS feeds to provide ticket details
|
||||
to feed readers or similar software.
|
||||
"""
|
||||
|
||||
try:
|
||||
from django.contrib.auth import get_user_model
|
||||
User = get_user_model()
|
||||
except ImportError:
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.syndication.views import Feed
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.db.models import Q
|
||||
@@ -20,6 +16,8 @@ from django.shortcuts import get_object_or_404
|
||||
|
||||
from helpdesk.models import Ticket, FollowUp, Queue
|
||||
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
class OpenTicketsByUser(Feed):
|
||||
title_template = 'helpdesk/rss/ticket_title.html'
|
||||
@@ -39,22 +37,22 @@ class OpenTicketsByUser(Feed):
|
||||
return _("Helpdesk: Open Tickets in queue %(queue)s for %(username)s") % {
|
||||
'queue': obj['queue'].title,
|
||||
'username': obj['user'].get_username(),
|
||||
}
|
||||
}
|
||||
else:
|
||||
return _("Helpdesk: Open Tickets for %(username)s") % {
|
||||
'username': obj['user'].get_username(),
|
||||
}
|
||||
}
|
||||
|
||||
def description(self, obj):
|
||||
if obj['queue']:
|
||||
return _("Open and Reopened Tickets in queue %(queue)s for %(username)s") % {
|
||||
'queue': obj['queue'].title,
|
||||
'username': obj['user'].get_username(),
|
||||
}
|
||||
}
|
||||
else:
|
||||
return _("Open and Reopened Tickets for %(username)s") % {
|
||||
'username': obj['user'].get_username(),
|
||||
}
|
||||
}
|
||||
|
||||
def link(self, obj):
|
||||
if obj['queue']:
|
||||
@@ -62,28 +60,28 @@ class OpenTicketsByUser(Feed):
|
||||
reverse('helpdesk:list'),
|
||||
obj['user'].id,
|
||||
obj['queue'].id,
|
||||
)
|
||||
)
|
||||
else:
|
||||
return u'%s?assigned_to=%s' % (
|
||||
reverse('helpdesk:list'),
|
||||
obj['user'].id,
|
||||
)
|
||||
)
|
||||
|
||||
def items(self, obj):
|
||||
if obj['queue']:
|
||||
return Ticket.objects.filter(
|
||||
assigned_to=obj['user']
|
||||
).filter(
|
||||
queue=obj['queue']
|
||||
).filter(
|
||||
Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
|
||||
)
|
||||
assigned_to=obj['user']
|
||||
).filter(
|
||||
queue=obj['queue']
|
||||
).filter(
|
||||
Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
|
||||
)
|
||||
else:
|
||||
return Ticket.objects.filter(
|
||||
assigned_to=obj['user']
|
||||
).filter(
|
||||
Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
|
||||
)
|
||||
assigned_to=obj['user']
|
||||
).filter(
|
||||
Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
|
||||
)
|
||||
|
||||
def item_pubdate(self, item):
|
||||
return item.created
|
||||
@@ -101,19 +99,18 @@ class UnassignedTickets(Feed):
|
||||
|
||||
title = _('Helpdesk: Unassigned Tickets')
|
||||
description = _('Unassigned Open and Reopened tickets')
|
||||
link = ''#%s?assigned_to=' % reverse('helpdesk:list')
|
||||
link = '' # '%s?assigned_to=' % reverse('helpdesk:list')
|
||||
|
||||
def items(self, obj):
|
||||
return Ticket.objects.filter(
|
||||
assigned_to__isnull=True
|
||||
).filter(
|
||||
Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
|
||||
)
|
||||
assigned_to__isnull=True
|
||||
).filter(
|
||||
Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
|
||||
)
|
||||
|
||||
def item_pubdate(self, item):
|
||||
return item.created
|
||||
|
||||
|
||||
def item_author_name(self, item):
|
||||
if item.assigned_to:
|
||||
return item.assigned_to.get_username()
|
||||
@@ -127,7 +124,7 @@ class RecentFollowUps(Feed):
|
||||
|
||||
title = _('Helpdesk: Recent Followups')
|
||||
description = _('Recent FollowUps, such as e-mail replies, comments, attachments and resolutions')
|
||||
link = '/tickets/' # reverse('helpdesk:list')
|
||||
link = '/tickets/' # reverse('helpdesk:list')
|
||||
|
||||
def items(self):
|
||||
return FollowUp.objects.order_by('-date')[:20]
|
||||
@@ -143,25 +140,25 @@ class OpenTicketsByQueue(Feed):
|
||||
def title(self, obj):
|
||||
return _('Helpdesk: Open Tickets in queue %(queue)s') % {
|
||||
'queue': obj.title,
|
||||
}
|
||||
}
|
||||
|
||||
def description(self, obj):
|
||||
return _('Open and Reopened Tickets in queue %(queue)s') % {
|
||||
'queue': obj.title,
|
||||
}
|
||||
}
|
||||
|
||||
def link(self, obj):
|
||||
return '%s?queue=%s' % (
|
||||
reverse('helpdesk:list'),
|
||||
obj.id,
|
||||
)
|
||||
)
|
||||
|
||||
def items(self, obj):
|
||||
return Ticket.objects.filter(
|
||||
queue=obj
|
||||
).filter(
|
||||
Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
|
||||
)
|
||||
queue=obj
|
||||
).filter(
|
||||
Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
|
||||
)
|
||||
|
||||
def item_pubdate(self, item):
|
||||
return item.created
|
||||
@@ -171,4 +168,3 @@ class OpenTicketsByQueue(Feed):
|
||||
return item.assigned_to.get_username()
|
||||
else:
|
||||
return _('Unassigned')
|
||||
|
||||
|
Reference in New Issue
Block a user