fixup! Explicitly set app_label for nav.models

Author: hmpf

python/nav/models/event.py

@@ -254,12 +254,12 @@ def _fetch_subject(self):
 
             subid = self.subid
             if self.event_type_id in self.SUBID_MAP:
-                model = apps.get_model('models', self.SUBID_MAP[self.event_type_id])
+                model = apps.get_model('nav_models', self.SUBID_MAP[self.event_type_id])
             elif (
                 self.event_type_id == 'maintenanceState'
                 and 'service' in self.varmap.get(EventQueue.STATE_START, {})
             ):
-                model = apps.get_model('models', 'Service')
+                model = apps.get_model('nav_models', 'Service')
             elif self.event_type_id == 'thresholdState':
                 return ThresholdEvent(self)
             else:
@@ -296,7 +296,7 @@ def __init__(self, event):
             ruleid = event.subid
             self.metric = None
 
-        klass = apps.get_model('models', 'ThresholdRule')
+        klass = apps.get_model('nav_models', 'ThresholdRule')
         try:
             self.rule = klass.objects.get(pk=ruleid)
         except (klass.DoesNotExist, ValueError):

python/nav/models/models.py

@@ -2,8 +2,8 @@
 # to find models.py (module) from an app in INSTALLED_APPS.
 #
 # 'models' need to be listed as it expects to find model_name under
-# app_label 'models', hence we add this empty placeholder and add 'models' to
-# INSTALLED_APPS to make sure 'models.ModelName' is valid lookup on django
+# app_label 'nav_models', hence we add this empty placeholder and add 'models' to
+# INSTALLED_APPS to make sure 'nav_models.ModelName' is valid lookup on django
 # form app_label.model_name
 
 from .manage import *