4 changes: 2 additions & 2 deletions geonode/locale/ar/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -6266,8 +6266,8 @@ msgid "GeoNode is an open source platform for sharing geospatial data and maps."
msgstr "GeoNode هو منصة مفتوحة المصدر لتبادل البيانات الجغرافية والخرائط."

#: geonode/templates/index.html:23
msgid "http://docs.geonode.org/en/2.10.x/usage"
msgstr "http://docs.geonode.org/en/2.10.x/usage"
msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"

#: geonode/templates/index.html:23
msgid "Get Started »"
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -1084,8 +1084,8 @@ msgstr "GeoNode ist eine Open-Source-Plattform zur Veröffentlichung von Geodate

#: geonode/contrib/geosites/site_template/templates/site_index.html:14
#: geonode/contrib/geosites/templates/master_index.html:15 geonode/templates/index.html:23
msgid "http://docs.geonode.org/en/2.10.x/usage"
msgstr "http://docs.geonode.org/en/2.10.x/usage"
msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"

#: geonode/contrib/geosites/site_template/templates/site_index.html:15
#: geonode/contrib/geosites/templates/master_index.html:16 geonode/templates/index.html:23
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/el/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -1182,8 +1182,8 @@ msgstr ""
#: geonode/contrib/geosites/site_template/templates/site_index.html:14
#: geonode/contrib/geosites/templates/master_index.html:15
#: geonode/templates/index.html:23
msgid "http://docs.geonode.org/en/2.10.x/usage"
msgstr ""
msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"

#: geonode/contrib/geosites/site_template/templates/site_index.html:15
#: geonode/contrib/geosites/templates/master_index.html:16
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -6666,8 +6666,8 @@ msgstr ""
"GeoNode is an open source platform for sharing geospatial data and maps."

#: geonode/templates/index.html:24
msgid "http://docs.geonode.org/en/2.10.x/usage"
msgstr "http://docs.geonode.org/en/2.10.x/usage"
msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"

#: geonode/templates/index.html:25
msgid "Get Started »"
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -6704,8 +6704,8 @@ msgid "home"
msgstr "Si vous avez des questions concernant le logiciel ou des services s'y rapportant, joignez-nous sur notre <a href=\"http://lists.osgeo.org/cgi-bin/mailman/listinfo/geonode-users\">mailing list</a>"

#: geonode/templates/index.html:23
msgid "http://docs.geonode.org/en/2.10.x/usage"
msgstr ""
msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"

#: geonode/templates/index.html:23
msgid "Get Started &raquo;"
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/it/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -6627,8 +6627,8 @@ msgstr ""
"geospaziali e mappe."

#: geonode/templates/index.html:24
msgid "http://docs.geonode.org/en/2.10.x/usage"
msgstr "http://docs.geonode.org/en/2.10.x/usage"
msgid "http://docs.geonode.org/en/2.10.x/usage/index.html"
msgstr "http://docs.geonode.org/en/2.10.x/usage/index.html"

#: geonode/templates/index.html:25
msgid "Get Started &raquo;"
Expand Down
12 changes: 7 additions & 5 deletions geonode/people/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

from taggit.managers import TaggableManager

from geonode.decorators import on_ogc_backend
from geonode.base.enumerations import COUNTRIES
from geonode.base.auth import (get_or_create_token,
delete_old_tokens,
Expand All @@ -42,8 +41,6 @@
from geonode.groups.models import GroupProfile
# from geonode.notifications_helper import send_notification

from geonode import geoserver

from allauth.account.signals import user_signed_up
from allauth.socialaccount.signals import social_account_added
# from account.models import EmailAddress
Expand Down Expand Up @@ -251,7 +248,6 @@ def profile_post_save(instance, sender, **kwargs):
signals.post_save.connect(profile_post_save, sender=Profile)


@on_ogc_backend(geoserver.BACKEND_PACKAGE)
def do_login(sender, user, request, **kwargs):
"""
Take action on user login. Generate a new user access_token to be shared
Expand All @@ -269,8 +265,14 @@ def do_login(sender, user, request, **kwargs):

set_session_token(request.session, token)

from geonode.groups.conf import settings as groups_settings
if groups_settings.AUTO_ASSIGN_REGISTERED_MEMBERS_TO_REGISTERED_MEMBERS_GROUP_NAME:
group_name = groups_settings.REGISTERED_MEMBERS_GROUP_NAME
groupprofile = GroupProfile.objects.filter(slug=group_name).first()
if groupprofile and not groupprofile.user_is_member(user):
groupprofile.join(user)


@on_ogc_backend(geoserver.BACKEND_PACKAGE)
def do_logout(sender, user, request, **kwargs):
if 'access_token' in request.session:
try:
Expand Down
2 changes: 1 addition & 1 deletion geonode/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h1>{{custom_theme.jumbotron_welcome_title|default:_("Welcome")}}</h1>
<p>{{custom_theme.jumbotron_welcome_content|default:_("GeoNode is an open source platform for sharing geospatial data and maps.")}}</p>
{% if not custom_theme.jumbotron_cta_hide %}
<p><a class="btn btn-default btn-lg" target="_blank"
href="{{custom_theme.jumbotron_cta_link|default:_("http://docs.geonode.org/en/2.10.x/usage")}}"
href="{{custom_theme.jumbotron_cta_link|default:_("http://docs.geonode.org/en/2.10.x/usage/index.html")}}"
role="button">{{custom_theme.jumbotron_cta_text|default:_("Get Started &raquo;")}}</a></p>
{% endif %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion geonode/tests/bdd/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def bdd_server(request, live_server):
def geonode_db_setup(django_db_setup, django_db_blocker):
with django_db_blocker.unblock():
call_command('loaddata', 'initial_data.json')
call_command('loaddata', 'group_test_data.json')
call_command('loaddata', 'profiles_test_data.json')
call_command('loaddata', 'default_oauth_apps.json')


Expand Down