Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #143 make people organization list #172

Merged
merged 2 commits into from
Aug 22, 2024
Merged

Issue #143 make people organization list #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa217bd
people organization corrected
silvadealmeida Aug 22, 2024
6d49e01
.
silvadealmeida Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions geonode/people/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 _
Expand Down Expand Up @@ -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")
)
Expand Down
6 changes: 0 additions & 6 deletions geonode/people/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading