From fa2ac294322d47f7c8f7fb31a3faf8b9a68f0ffb Mon Sep 17 00:00:00 2001 From: allyoucanmap Date: Thu, 29 Jul 2021 13:11:30 +0200 Subject: [PATCH] fix action navbar filters --- .../static/mapstore/configs/localConfig.json | 14 +++++++++++--- .../static/mapstore/translations/data.de-DE.json | 2 ++ .../static/mapstore/translations/data.en-US.json | 1 + .../static/mapstore/translations/data.es-ES.json | 2 ++ .../static/mapstore/translations/data.fr-FR.json | 2 ++ .../static/mapstore/translations/data.it-IT.json | 2 ++ .../templatetags/get_menu_json.py | 10 +++++----- 7 files changed, 25 insertions(+), 8 deletions(-) diff --git a/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json b/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json index 878655252b..3ab2552ba5 100644 --- a/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json +++ b/geonode_mapstore_client/client/static/mapstore/configs/localConfig.json @@ -255,7 +255,7 @@ ] }, { - "id": "documents", + "id": "document", "labelId": "gnhome.documents", "type": "filter", "query": { @@ -263,7 +263,7 @@ } }, { - "id": "maps", + "id": "map", "labelId": "gnhome.maps", "type": "filter", "query": { @@ -272,12 +272,20 @@ }, { "id": "geostory", - "labelId": "gnhome.geostory", + "labelId": "gnhome.geostories", "type": "filter", "query": { "filter{resource_type.in}": "geostory" } }, + { + "id": "dashboard", + "labelId": "gnhome.dashboards", + "type": "filter", + "query": { + "filter{resource_type.in}": "dashboard" + } + }, { "id": "favorite", "labelId": "gnhome.favorites", diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json b/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json index 41bf90aad2..a7779f77b5 100644 --- a/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json +++ b/geonode_mapstore_client/client/static/mapstore/translations/data.de-DE.json @@ -98,6 +98,8 @@ "addRemoteService": "Remote Service hinzufügen", "exploreMaps": "Karten erkunden", "createMap": "Karte erstellen", + "dashboard": "Dashboard", + "dashboards": "Dashboards", "apps": "app", "createApp": "Karte app", "announcements": "Ankündigungen", diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json b/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json index df66c72e04..879cc9803e 100644 --- a/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json +++ b/geonode_mapstore_client/client/static/mapstore/translations/data.en-US.json @@ -100,6 +100,7 @@ "exploreMaps": "Explore maps", "createMap": "Create map", "dashboard": "Dashboard", + "dashboards": "Dashboards", "apps": "Apps", "createApp": "Create app", "announcements": "Announcements", diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json b/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json index cd0d53c532..42e517d56d 100644 --- a/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json +++ b/geonode_mapstore_client/client/static/mapstore/translations/data.es-ES.json @@ -98,6 +98,8 @@ "addRemoteService": "Agregar servicio remoto", "exploreMaps": "Explora mapas", "createMap": "Crear mapa", + "dashboard": "Dashboard", + "dashboards": "Dashboards", "apps": "Apps", "createApp": "Crear app", "announcements": "Anuncios", diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json b/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json index f7f5c23a4c..109c3612bf 100644 --- a/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json +++ b/geonode_mapstore_client/client/static/mapstore/translations/data.fr-FR.json @@ -98,6 +98,8 @@ "addRemoteService": "Ajouter un service à distance", "exploreMaps": "Explorer les cartes", "createMap": "Créer une carte", + "dashboard": "Dashboard", + "dashboards": "Dashboards", "apps": "Apps", "createApp": "Créer une app", "announcements": "Annonces", diff --git a/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json b/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json index 1eb107e28f..ef526cdec0 100644 --- a/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json +++ b/geonode_mapstore_client/client/static/mapstore/translations/data.it-IT.json @@ -100,6 +100,8 @@ "addRemoteService": "Aggiungi servizio remoto", "exploreMaps": "Esplora mappe", "createMap": "Crea mappa", + "dashboard": "Dashboard", + "dashboards": "Dashboards", "apps": "Apps", "createApp": "Crea app", "announcements": "Notizie", diff --git a/geonode_mapstore_client/templatetags/get_menu_json.py b/geonode_mapstore_client/templatetags/get_menu_json.py index ae062d9402..045c157c6b 100644 --- a/geonode_mapstore_client/templatetags/get_menu_json.py +++ b/geonode_mapstore_client/templatetags/get_menu_json.py @@ -26,29 +26,29 @@ def get_base_left_topbar_menu(): "items": [ { "type": "link", - "href": "/catalogue/#/search/?filter{resource_type.in}=dataset", + "href": "/catalogue/#/search/?f=dataset", "label": "Datasets" }, { "type": "link", - "href": "/catalogue/#/search/?filter{resource_type.in}=document", + "href": "/catalogue/#/search/?f=document", "label": "Documents" } ] }, { "type": "link", - "href": "/catalogue/#/search/?filter{resource_type.in}=map", + "href": "/catalogue/#/search/?f=map", "label": "Maps" }, { "type": "link", - "href": "/catalogue/#/search/?filter{resource_type.in}=geostory", + "href": "/catalogue/#/search/?f=geostory", "label": "GeoStories" }, { "type": "link", - "href": "/catalogue/#/search/?filter{resource_type.in}=dashboard", + "href": "/catalogue/#/search/?f=dashboard", "label": "Dashboards" } ]