Skip to content

Commit

Permalink
#103 GeoNode CSW catalog requires the dc:type=dataset filtert + updat…
Browse files Browse the repository at this point in the history
…e submodule (#185)

* rename permissionsList to perms
* update submodule to include csw filter for layer
* update submodule to include unique interval classification in visual style editor
  • Loading branch information
allyoucanmap authored May 18, 2021
1 parent 4606557 commit 46e3cc3
Show file tree
Hide file tree
Showing 227 changed files with 79 additions and 39 deletions.
6 changes: 3 additions & 3 deletions geonode_mapstore_client/client/js/utils/AppUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ export function setupConfiguration({
...config
} = localConfig;
const geoNodePageConfig = window.__GEONODE_CONFIG__ || {};
const permissionsList = geoNodePageConfig.permissionsList || [];
const perms = geoNodePageConfig.perms || [];

const canEdit = geoNodePageConfig.isNewResource || permissionsList.indexOf('change_resourcebase') !== -1;
const canView = geoNodePageConfig.isNewResource || permissionsList.indexOf('view_resourcebase') !== -1;
const canEdit = geoNodePageConfig.isNewResource || perms.indexOf('change_resourcebase') !== -1;
const canView = geoNodePageConfig.isNewResource || perms.indexOf('view_resourcebase') !== -1;
Object.keys(config).forEach((key) => {
setConfigProp(key, config[key]);
});
Expand Down
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
geonode-mapstore-client-v2.0.9-95a374e946764415ac418803b3d31fffc2e48dc5
geonode-mapstore-client-v2.0.9-9a6690a602242fb090efb02bb5d71409f2afe013
39 changes: 32 additions & 7 deletions geonode_mapstore_client/static/mapstore/configs/localConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
{
"name": "geoNodeResourcesInfo",
"path": "localConfig.geoNodeResourcesInfo"
},
{
"name": "selectedLayerPermissions",
"path": "gnresource.selectedLayerPermissions"
}

],
Expand Down Expand Up @@ -1124,7 +1128,10 @@
"name": "Playback"
},
{
"name": "LayerDownload"
"name": "LayerDownload",
"cfg": {
"disablePluginIf": "{!state('selectedLayerPermissions').includes('download_resourcebase')}"
}
},
{
"name": "AddLayer"
Expand Down Expand Up @@ -1396,7 +1403,10 @@
"name": "Playback"
},
{
"name": "LayerDownload"
"name": "LayerDownload",
"cfg": {
"disablePluginIf": "{!state('selectedLayerPermissions').includes('download_resourcebase')}"
}
},
{
"name": "AddLayer"
Expand Down Expand Up @@ -1665,7 +1675,10 @@
"name": "Playback"
},
{
"name": "LayerDownload"
"name": "LayerDownload",
"cfg": {
"disablePluginIf": "{!state('selectedLayerPermissions').includes('download_resourcebase')}"
}
},
{
"name": "AddLayer"
Expand Down Expand Up @@ -1914,7 +1927,10 @@
"name": "Playback"
},
{
"name": "LayerDownload"
"name": "LayerDownload",
"cfg": {
"disablePluginIf": "{!state('selectedLayerPermissions').includes('download_resourcebase')}"
}
},
{
"name": "AddLayer"
Expand Down Expand Up @@ -2181,7 +2197,10 @@
"name": "Playback"
},
{
"name": "LayerDownload"
"name": "LayerDownload",
"cfg": {
"disablePluginIf": "{!state('selectedLayerPermissions').includes('download_resourcebase')}"
}
},
{
"name": "AddLayer"
Expand Down Expand Up @@ -2664,7 +2683,10 @@
"name": "Playback"
},
{
"name": "LayerDownload"
"name": "LayerDownload",
"cfg": {
"disablePluginIf": "{!state('selectedLayerPermissions').includes('download_resourcebase')}"
}
},
{
"name": "AddLayer"
Expand Down Expand Up @@ -3004,7 +3026,10 @@
"name": "Playback"
},
{
"name": "LayerDownload"
"name": "LayerDownload",
"cfg": {
"disablePluginIf": "{!state('selectedLayerPermissions').includes('download_resourcebase')}"
}
},
{
"name": "AddLayer"
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 46e3cc3

Please sign in to comment.