Merge pull request #322 from atmaniak/master

Fix exception for templetags
django-helpdesk · May 12, 2015 · 1ff45f4 · 1ff45f4
2 parents 93cb72f + b0db7aa
commit 1ff45f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/helpdesk/templatetags/load_helpdesk_settings.py b/helpdesk/templatetags/load_helpdesk_settings.py
@@ -9,13 +9,13 @@
 from helpdesk import settings as helpdesk_settings_config
 
 def load_helpdesk_settings(request):
-#    try:
+    try:
         return helpdesk_settings_config
-#    except Exception, e:
-#        import sys
-#        print >> sys.stderr,  "'load_helpdesk_settings' template tag (django-helpdesk) crashed with following error:"
-#        print >> sys.stderr,  e
-#        return ''
+    except Exception as e:
+        import sys
+        print >> sys.stderr,  "'load_helpdesk_settings' template tag (django-helpdesk) crashed with following error:"
+        print >> sys.stderr,  e
+        return ''
 
 register = Library()
 register.filter('load_helpdesk_settings', load_helpdesk_settings)
diff --git a/helpdesk/templatetags/saved_queries.py b/helpdesk/templatetags/saved_queries.py
@@ -12,14 +12,14 @@
 
 
 def saved_queries(user):
-#    try:
+    try:
         user_saved_queries = SavedSearch.objects.filter(Q(user=user) | Q(shared__exact=True))
         return user_saved_queries
-#    except Exception, e:
-#        import sys
-#        print >> sys.stderr,  "'saved_queries' template tag (django-helpdesk) crashed with following error:"
-#        print >> sys.stderr,  e
-#        return ''
+    except Exception as e:
+        import sys
+        print >> sys.stderr,  "'saved_queries' template tag (django-helpdesk) crashed with following error:"
+        print >> sys.stderr,  e
+        return ''
 
 register = Library()
 register.filter('saved_queries', saved_queries)