Merge pull request #1106 from SeanOverton/633-remove-target-from-org-…

…dropdown-when-in-use

issue-633: added already-in-org filter to target dropdown in org form

web/targetApp/forms.py

@@ -38,7 +38,7 @@ class AddOrganizationForm(forms.Form):
     def __init__(self, *args, **kwargs):
         project = kwargs.pop('project')
         super(AddOrganizationForm, self).__init__(*args, **kwargs)
-        self.fields['domains'].choices = [(domain.id, domain.name) for domain in Domain.objects.filter(project__slug=project)]
+        self.fields['domains'].choices = [(domain.id, domain.name) for domain in Domain.objects.filter(project__slug=project) if not domain.get_organization()]
 
     name = forms.CharField(
         required=True,