Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/.env
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ CLIENT_RESULTS_LIMIT=5
API_LIMIT_PER_PAGE=1000

# GIS Client
GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
GEONODE_LEGACY_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
MAPBOX_ACCESS_TOKEN=
GOOGLE_API_KEY=

Expand Down
2 changes: 1 addition & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ CLIENT_RESULTS_LIMIT=5
API_LIMIT_PER_PAGE=1000

# GIS Client
GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
GEONODE_LEGACY_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
MAPBOX_ACCESS_TOKEN=
GOOGLE_API_KEY=

Expand Down
2 changes: 1 addition & 1 deletion .env_dev
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ CLIENT_RESULTS_LIMIT=5
API_LIMIT_PER_PAGE=1000

# GIS Client
GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
GEONODE_LEGACY_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
MAPBOX_ACCESS_TOKEN=
GOOGLE_API_KEY=

Expand Down
2 changes: 1 addition & 1 deletion .env_test
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ CLIENT_RESULTS_LIMIT=5
API_LIMIT_PER_PAGE=1000

# GIS Client
GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
GEONODE_LEGACY_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
MAPBOX_ACCESS_TOKEN=
GOOGLE_API_KEY=

Expand Down
8 changes: 4 additions & 4 deletions docs/src/setup/br.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ for the classic and Docker environments accordingly. The content is similar in b
# data_layername_exclude_filter = {comma separated list of layernames, optionally with glob syntax} e.g.: tuscany_*,italy

[fixtures]
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite

The ``settings.ini`` file can be created in any directory accessible by GeoNode, and it's path can be passed to the backup / restore
procedures using `-c` (`--config`) argument.
Expand Down Expand Up @@ -152,8 +152,8 @@ This section allows to enable / disable a full data backup / restore of GeoServe
#### [fixtures] Section

[fixtures]
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite


This section is the most complex one. Usually you don't need to modify it. Only an expert user who knows Python and GeoNode model structure should modify this section.
Expand Down
2 changes: 1 addition & 1 deletion geonode/base/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@ def keyword_csv(self):
return ""

def get_absolute_url(self):
from geonode.client.hooks import hookset
from geonode.legacy_client.hooks import hookset

try:
return (
Expand Down
2 changes: 1 addition & 1 deletion geonode/base/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ def resourcebase_embed(request, resourcebaseid, template="base/base_edit.html"):
"group": group,
"perms_list": perms_list,
"permissions_json": permissions_json,
"preview": getattr(settings, "GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY", "mapstore"),
"preview": getattr(settings, "GEONODE_LEGACY_CLIENT_LAYER_PREVIEW_LIBRARY", "mapstore"),
}

return render(request, template, context=_ctx)
4 changes: 2 additions & 2 deletions geonode/br/management/commands/settings_docker_sample.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ dumprasterdata = yes
# data_layername_exclude_filter = {comma separated list of layernames, optionally with glob syntax} e.g.: tuscany_*,italy

[fixtures]
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite

4 changes: 2 additions & 2 deletions geonode/br/management/commands/settings_sample.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ dumprasterdata = yes
# data_layername_exclude_filter = {comma separated list of layernames, optionally with glob syntax} e.g.: tuscany_*,italy

[fixtures]
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite,geonode_client
apps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite
dumps = contenttypes,auth,people,groups,account,guardian,admin,actstream,announcements,avatar,assets,base,documents,geoserver,invitations,pinax_notifications,harvesting,services,layers,maps,metadata,oauth2_provider,sites,socialaccount,taggit,tastypie,upload,geonode_themes,geoapps,favorite
44 changes: 0 additions & 44 deletions geonode/client/migrations/0001_initial.py

This file was deleted.

35 changes: 0 additions & 35 deletions geonode/client/migrations/0002_auto_20180412_1039.py

This file was deleted.

This file was deleted.

This file was deleted.

29 changes: 0 additions & 29 deletions geonode/client/migrations/0004_auto_20180416_1319.py

This file was deleted.

24 changes: 0 additions & 24 deletions geonode/client/migrations/0005_auto_20181015_1201.py

This file was deleted.

Empty file.
2 changes: 1 addition & 1 deletion geonode/documents/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from django.utils.translation import gettext_lazy as _

from geonode.assets.models import LocalAsset
from geonode.client.hooks import hookset
from geonode.legacy_client.hooks import hookset
from geonode.base.models import ResourceBase
from geonode.groups.conf import settings as groups_settings
from geonode.documents.enumerations import DOCUMENT_TYPE_MAP, DOCUMENT_MIMETYPE_MAP
Expand Down
2 changes: 1 addition & 1 deletion geonode/documents/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

from geonode.security.utils import check_add_remote_resource_perm
from geonode.base.api.exceptions import geonode_exception_handler
from geonode.client.hooks import hookset
from geonode.legacy_client.hooks import hookset
from geonode.utils import mkdtemp
from geonode.base import register_event
from geonode.base.bbox_utils import BBOXHelper
Expand Down
2 changes: 1 addition & 1 deletion geonode/geoapps/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from guardian.shortcuts import get_anonymous_user

from geonode.base.models import ResourceBase
from geonode.client.hooks import hookset
from geonode.legacy_client.hooks import hookset

logger = logging.getLogger("geonode.geoapps.models")

Expand Down
2 changes: 1 addition & 1 deletion geonode/geoapps/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def geoapp_embed(request, geoappid, template="apps/app_embed.html"):
"group": group,
"perms_list": perms_list,
"permissions_json": permissions_json,
"preview": getattr(settings, "GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY", "mapstore"),
"preview": getattr(settings, "GEONODE_LEGACY_CLIENT_LAYER_PREVIEW_LIBRARY", "mapstore"),
}

return render(request, template, context=_ctx)
2 changes: 1 addition & 1 deletion geonode/geoserver/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
from guardian.shortcuts import get_objects_for_user

from geonode.base.models import ResourceBase
from geonode.client.hooks import hookset
from geonode.legacy_client.hooks import hookset
from geonode.compat import ensure_string
from geonode.base.auth import get_auth_user, get_or_create_token
from geonode.decorators import logged_in_or_basicauth
Expand Down
2 changes: 1 addition & 1 deletion geonode/layers/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from django.utils.functional import classproperty
from django.utils.translation import gettext_lazy as _

from geonode.client.hooks import hookset
from geonode.legacy_client.hooks import hookset
from geonode import GeoNodeException
from geonode.utils import build_absolute_uri, check_shp_columnnames, check_bbox_validity, normalize_bbox_to_float_list
from geonode.security.models import PermissionLevelMixin
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions geonode/client/apps.py → geonode/legacy_client/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@


class AppConfig(BaseAppConfig):
name = "geonode.client"
label = "geonode_client"
name = "geonode.legacy_client"
label = "geonode_legacy_client"
verbose_name = _("GeoNode Client Library")
4 changes: 2 additions & 2 deletions geonode/client/conf.py → geonode/legacy_client/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ def load_path_attr(path):

class GeoNodeClientAppConf(AppConf):
LAYER_PREVIEW_LIBRARY = "geonode"
HOOKSET = "geonode.client.hooksets.BaseHookSet"
HOOKSET = "geonode.legacy_client.hooksets.BaseHookSet"

def configure_hookset(self, value):
return load_path_attr(value)()

class Meta:
prefix = "geonode_client"
prefix = "geonode_legacy_client"
6 changes: 3 additions & 3 deletions geonode/client/hooks.py → geonode/legacy_client/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

class HookProxy:
def __getattr__(self, attr):
if not isinstance(settings.GEONODE_CLIENT_HOOKSET, str):
return getattr(settings.GEONODE_CLIENT_HOOKSET, attr)
if not isinstance(settings.GEONODE_LEGACY_CLIENT_HOOKSET, str):
return getattr(settings.GEONODE_LEGACY_CLIENT_HOOKSET, attr)
else:
import importlib

cls = settings.GEONODE_CLIENT_HOOKSET.split(".")
cls = settings.GEONODE_LEGACY_CLIENT_HOOKSET.split(".")
module_name, class_name = (".".join(cls[:-1]), cls[-1])
i = importlib.import_module(module_name)
hook = getattr(i, class_name)()
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion geonode/maps/api/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def test_maps(self):
layers_data = response.data
self.assertIsNotNone(layers_data)

if settings.GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == "mapstore":
if settings.GEONODE_LEGACY_CLIENT_LAYER_PREVIEW_LIBRARY == "mapstore":
url = reverse("maps-list")
self.assertEqual(url, "/api/v2/maps")

Expand Down
Loading
Loading