Changeset 11406 for src/django_gheat/gheat

Timestamp:

Aug 16, 2012, 9:00:50 PM (12 years ago)

Author:

rick

Message:

Re-install of heatmap on other server with Django 1.4

Location:

src/django_gheat/gheat

Files:

• admin.py (modified) (1 diff)
• dataimport/__init__.py (modified) (1 diff)

src/django_gheat/gheat/admin.py

@@ -4 +4 @@
 class AccesspointAdmin(admin.ModelAdmin):
   list_display = ['ssid','type', 'mac', 'organization']
-  search_fields = ['ssid', 'mac', 'organization']
+  search_fields = ['ssid', 'mac', 'organization__name']
   ordering = ['ssid']
 admin.site.register(Accesspoint, AccesspointAdmin)

src/django_gheat/gheat/dataimport/__init__.py

@@ -64 +64 @@
   global organizations
   if not organizations:
-   organizations = dict(Organization.objects.all().values_list('name','id'))
+    organizations = dict(Organization.objects.all().values_list('name','id'))
   
   name = Organization.get_name_by_ssid(ssid)
-  if not name:
-    return 'NULL'
+  if not organizations.has_key(name):
+    return None
   else:
-    return int(organizations[name])
+    return str(organizations[name])