Merge remote-tracking branch 'origin', tag 'v2.6.8' into multilink-circuit

Fixes 3749 attribute error

docs/release-notes/version-2.6.md

@@ -1,3 +1,9 @@
+# v2.6.9 (FUTURE)
+
+## Bug Fixes
+
+* [#3749](https://github.com/netbox-community/netbox/issues/3749) - Fix exception on password change page for local users
+
 # v2.6.8 (2019-12-10)
 
 ## Enhancements

netbox/dcim/migrations/0070_multilink_circuit.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.2 on 2019-06-17 19:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0069_deprecate_nullablecharfield'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='interface',
+            name='_connected_circuittermination',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='circuits.CircuitTermination'),
+        ),
+    ]

netbox/dcim/models.py

@@ -2178,7 +2178,7 @@ class Interface(CableTermination, ComponentModel):
         blank=True,
         null=True
     )
-    _connected_circuittermination = models.OneToOneField(
+    _connected_circuittermination = models.ForeignKey(
         to='circuits.CircuitTermination',
         on_delete=models.SET_NULL,
         related_name='+',
@@ -2971,8 +2971,10 @@ class Cable(ChangeLoggedModel):
         Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be
         None.
         """
-        a_path = self.termination_b.trace()
-        b_path = self.termination_a.trace()
+        from circuits.models import CircuitTermination
+
+        a_path = self.termination_b.trace(follow_circuits=True)
+        b_path = self.termination_a.trace(follow_circuits=True)
 
         # Determine overall path status (connected or planned)
         if self.status == CONNECTION_STATUS_PLANNED:
@@ -2987,6 +2989,18 @@ class Cable(ChangeLoggedModel):
         a_endpoint = a_path[-1][2]
         b_endpoint = b_path[-1][2]
 
+        # If there is nothing on the other end show the first circuit
+        if not a_endpoint:
+            for segment in a_path:
+                if isinstance(segment[2], (Interface, CircuitTermination)):
+                    a_endpoint = segment[2]
+                    break
+        if not b_endpoint:
+            for segment in b_path:
+                if isinstance(segment[2], (Interface, CircuitTermination)):
+                    b_endpoint = segment[2]
+                    break
+
         return a_endpoint, b_endpoint, path_status
 
 

netbox/netbox/settings.py

@@ -12,7 +12,7 @@ from django.core.exceptions import ImproperlyConfigured
 # Environment setup
 #
 
-VERSION = '2.6.8'
+VERSION = '2.6.9-dev'
 
 # Hostname
 HOSTNAME = platform.node()

netbox/users/views.py

@@ -96,7 +96,7 @@ class ChangePasswordView(LoginRequiredMixin, View):
 
     def get(self, request):
         # LDAP users cannot change their password here
-        if getattr(request.user, 'ldap_username'):
+        if getattr(request.user, 'ldap_username', None):
             messages.warning(request, "LDAP-authenticated user credentials cannot be changed within NetBox.")
             return redirect('user:profile')