Merge pull request #41 from ridoo/align-with-v4.3.x

Align with v4.3.x

Author: giohappy

subsites/serializers.py

@@ -1,4 +1,4 @@
-from geonode.base.api.serializers import UserSerializer
+from geonode.people.api.serializers import UserSerializer
 from geonode.base.api.serializers import ResourceBaseSerializer
 from subsites.utils import extract_subsite_slug_from_request
 from geonode.documents.api.serializers import DocumentSerializer

subsites/templatetags/custom_tags.py

@@ -36,9 +36,9 @@ def load_subsite_queryset():
     return qr
 
 
-@register.simple_tag(takes_context=True)
-def subsite_get_base_left_topbar_menu(context, request):
-    result = get_base_left_topbar_menu(context)
+@register.simple_tag
+def subsite_get_base_left_topbar_menu(request):
+    result = get_base_left_topbar_menu()
     subsite = extract_subsite_slug_from_request(request)
     if subsite:
         result = _update_url_with_subsite(result, subsite)

subsites/views.py

@@ -1,7 +1,8 @@
 from datetime import datetime
 from django.conf import settings
 from django.views.generic import TemplateView
-from geonode.base.api.views import ResourceBaseViewSet, UserViewSet
+from geonode.base.api.views import ResourceBaseViewSet
+from geonode.people.api.views import UserViewSet
 from geonode.documents.api.views import DocumentViewSet
 from geonode.geoapps.api.views import GeoAppViewSet
 from geonode.layers.api.views import DatasetViewSet