Merge branch 'bugfix'

Fixes a logical issue that could be caused by editing InstServer properties

djnro/templates/edumanage/servers_edit.html

@@ -9,12 +9,14 @@
 <h4>{% if edit %}{{form.instance.get_name}} ({% trans "edit" %}){% else %}{% trans "Add Server" %}{% endif %}</h4>
 <hr>
 <form method="POST" class="form-horizontal">
-	{% csrf_token %}
 	{% if form.non_field_errors %}
-	<p class="error">
-		{{ form.non_field_errors}}
-	</p>
+	<ul>
+	{% for error in form.non_field_errors %}
+		<li class="alert-danger"><strong>{{ error }}</strong></li>
+	{% endfor %}
+	</ul>
 	{% endif %}
+	{% csrf_token %}
 	<div style="display: none">
 		{{form.instid}}
 	</div>

edumanage/models.py

@@ -9,6 +9,7 @@ from django.core import exceptions
 from django.conf import settings
 from django.contrib.auth.models import User
 from django import forms
+from django.core.exceptions import ValidationError
 
 
 class MultiSelectFormField(forms.MultipleChoiceField):
@@ -261,6 +262,19 @@ class InstServer(models.Model):
             return self.name
         return self.host
 
+    # If a server is a proxy for a realm, can not change type to SP
+    def clean(self):
+        if self.ertype == 2:
+            realms = InstRealm.objects.filter(proxyto=self)
+            if len(realms) > 0:
+                text = str()
+                for realm in realms:
+                    text = text + ' ' + realm.realm
+                raise ValidationError(
+                    'You cannot change this server to SP (it is used by realms %s)' %
+                    ', '.join([r.realm for r in realms])
+                    )
+
 
 class InstRealmMon(models.Model):
     '''