Merge pull request #172 from zalf-rdm/issue_#143_make_people_organiza…

…tion_list

Issue #143 make people organization list

geonode/people/forms.py

@@ -20,6 +20,7 @@
 import taggit
 
 from django import forms
+from geonode.base.models import FundingReference
 from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 from django.utils.translation import ugettext as _
@@ -55,6 +56,9 @@ class ForgotUsernameForm(forms.Form):
 
 
 class ProfileForm(forms.ModelForm):
+    organization = forms.ModelChoiceField(
+        queryset=FundingReference.objects.values_list("funder_name", flat=True), to_field_name="funder_name"
+    )
     keywords = taggit.forms.TagField(
         label=_("Keywords"), required=False, help_text=_("A space or comma-separated list of keywords")
     )

geonode/people/models.py

@@ -56,21 +56,15 @@ def get_by_natural_key(self, username):
         return self.get(username=username)
 
 
-# ORGANIZATION_LIST = FundingReference.objects.values()
-# print(ORGANIZATION_LIST)
-
-
 class Profile(AbstractUser):
     """Fully featured Geonode user"""
 
-    # ORGANIZATION_LIST = FundingReference.objects.values_list("funder_name", "funder_name")
     organization = models.CharField(
         _("Organization Name"),
         max_length=255,
         blank=True,
         null=True,
         help_text=_("name of the responsible organization"),
-        # choices=ORGANIZATION_LIST,
     )
     profile = models.TextField(_("Profile"), null=True, blank=True, help_text=_("introduce yourself"))
     position = models.CharField(