diff --git a/.gitignore b/.gitignore index e56ce534acc3434d1fa2efaecb2af2ad7eaee2ea..3c51d011641f0c0d6b564141e0a34d28f5c13ce9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ nnmon.egg-info/ *.pyc # Ignore the vim swp files .*.swp +# Compiled messages +*.mo diff --git a/bt/templatetags/json_filters.py b/bt/templatetags/json_filters.py index 723346413967af6a59b2cbfba8f85c8b863bcade..3bbfe3ed21a073b6131829e3799fc04c33437737 100644 --- a/bt/templatetags/json_filters.py +++ b/bt/templatetags/json_filters.py @@ -13,6 +13,6 @@ def jsonify(object): elif object == []: return json.dumps(object) elif isinstance(object[0], SearchResult): - return serialize('json', [x.object for x in object]) + return json.dumps([x.get_additional_fields() for x in object]) else: return json.dumps(object) diff --git a/bt/views.py b/bt/views.py index b7c99a2c41b1bc6ec02888d46b982974ffc204c8..658e474c1cdad246108ed8111d712ab67dd1da9c 100644 --- a/bt/views.py +++ b/bt/views.py @@ -256,7 +256,7 @@ class LookupView(SearchView): def get_context_data(self, *args, **kwargs): context = super(LookupView, self).get_context_data(*args, **kwargs) if 'object_list' in context: - context['object_list'] = [obj for obj in context['object_list'] if not obj.object.old] + context['object_list'] = [obj for obj in context['object_list'] if not obj.old] return context class ViolationSearchView(SearchView): diff --git a/nnmon/locale/de/LC_MESSAGES/django.mo b/nnmon/locale/de/LC_MESSAGES/django.mo deleted file mode 100644 index 7a734cb48402b1924cbc5e749b64a03145b6c4f0..0000000000000000000000000000000000000000 Binary files a/nnmon/locale/de/LC_MESSAGES/django.mo and /dev/null differ diff --git a/nnmon/locale/en/LC_MESSAGES/django.mo b/nnmon/locale/en/LC_MESSAGES/django.mo deleted file mode 100644 index 865384e443481eeb5e5f76a9c72bbbcf2f782532..0000000000000000000000000000000000000000 Binary files a/nnmon/locale/en/LC_MESSAGES/django.mo and /dev/null differ diff --git a/nnmon/locale/es/LC_MESSAGES/django.mo b/nnmon/locale/es/LC_MESSAGES/django.mo deleted file mode 100644 index 7a734cb48402b1924cbc5e749b64a03145b6c4f0..0000000000000000000000000000000000000000 Binary files a/nnmon/locale/es/LC_MESSAGES/django.mo and /dev/null differ diff --git a/nnmon/locale/fr/LC_MESSAGES/django.mo b/nnmon/locale/fr/LC_MESSAGES/django.mo deleted file mode 100644 index 3004eda3559364e1ba8b7ac4c292c236f98a70b1..0000000000000000000000000000000000000000 Binary files a/nnmon/locale/fr/LC_MESSAGES/django.mo and /dev/null differ