holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed issue #29, thank you to Jason Nolen for reporting it. Prior

Browse Source 
versions of Python used a different name for base64 functions, so 
  a wrapper has been added to lib.py to enable both old- and new-
  style functions to be used.
This commit is contained in:
Ross Poulton 2008-11-18 00:14:36 +00:00
parent 3361e08458
commit 77f3e71bd9
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib.py
View File

@ -8,6 +8,14 @@ lib.py - Common functions (eg multipart e-mail)
chart_colours = ('80C65A', '990066', 'FF9900', '3399CC', 'BBCCED', '3399CC', 'FFCC33') chart_colours = ('80C65A', '990066', 'FF9900', '3399CC', 'BBCCED', '3399CC', 'FFCC33')
try:
from base64 import urlsafe_b64encode as b64encode
except ImportError:
from base64 import encodestring as b64encode
try:
from base64 import urlsafe_b64decode as b64decode
except ImportError:
from base64 import decodestring as b64decode
def send_templated_mail(template_name, email_context, recipients, sender=None, bcc=None, fail_silently=False, files=None): def send_templated_mail(template_name, email_context, recipients, sender=None, bcc=None, fail_silently=False, files=None):
""" """
@ -327,3 +335,4 @@ def safe_template_context(ticket):
context['ticket']['assigned_to'] = context['ticket']['_get_assigned_to'] context['ticket']['assigned_to'] = context['ticket']['_get_assigned_to']
return context return context

10
models.py
View File

@ -880,14 +880,16 @@ class UserSettings(models.Model):
def _set_settings(self, data): def _set_settings(self, data):
# data should always be a Python dictionary. # data should always be a Python dictionary.
import cPickle, base64 import cPickle
self.settings_pickled = base64.urlsafe_b64encode(cPickle.dumps(data)) from helpdesk.lib import b64encode
self.settings_pickled = b64encode(cPickle.dumps(data))
def _get_settings(self): def _get_settings(self):
# return a python dictionary representing the pickled data. # return a python dictionary representing the pickled data.
import cPickle, base64 import cPickle
from helpdesk.lib import b64decode
try: try:
return cPickle.loads(base64.urlsafe_b64decode(str(self.settings_pickled))) return cPickle.loads(b64decode(str(self.settings_pickled)))
except cPickle.UnpicklingError: except cPickle.UnpicklingError:
return {} return {}

10
views/staff.py
View File

@ -308,8 +308,9 @@ def ticket_list(request):
if not (saved_query.shared or saved_query.user == request.user): if not (saved_query.shared or saved_query.user == request.user):
return HttpResponseRedirect(reverse('helpdesk_list')) return HttpResponseRedirect(reverse('helpdesk_list'))
import base64, cPickle import cPickle
query_params = cPickle.loads(base64.urlsafe_b64decode(str(saved_query.query))) from helpdesk.lib import b64decode
query_params = cPickle.loads(b64decode(str(saved_query.query)))
elif not ( request.GET.has_key('queue') elif not ( request.GET.has_key('queue')
or request.GET.has_key('assigned_to') or request.GET.has_key('assigned_to')
or request.GET.has_key('status') or request.GET.has_key('status')
@ -366,8 +367,9 @@ def ticket_list(request):
tickets = apply_query(Ticket.objects.select_related(), query_params) tickets = apply_query(Ticket.objects.select_related(), query_params)
import cPickle, base64 import cPickle
urlsafe_query = base64.urlsafe_b64encode(cPickle.dumps(query_params)) from helpdesk.lib import b64encode
urlsafe_query = b64encode(cPickle.dumps(query_params))
user_saved_queries = SavedSearch.objects.filter(Q(user=request.user) | Q(shared__exact=True)) user_saved_queries = SavedSearch.objects.filter(Q(user=request.user) | Q(shared__exact=True))