Skip to content

Commit

Permalink
[Fixes #10251] Review geonode management command set_layers_permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
mattiagiupponi committed Nov 4, 2022
1 parent 7b2ddf5 commit 5b2f2ce
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion geonode/base/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def set_user_and_group_dataset_permission(modeladmin, request, queryset):
}

form = UserAndGroupPermissionsForm({
'permission_type': ('read', ),
'permission_type': ('read', "Read"),
'mode': 'set',
'ids': ids,
})
Expand Down
6 changes: 3 additions & 3 deletions geonode/base/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def user_and_group_permission(request, model):
form = UserAndGroupPermissionsForm(request.POST)
ids = ids.split(",")
if form.is_valid():
resources_names = [layer.pk for layer in form.cleaned_data.get('layers')]
resources_names = [layer.title for layer in form.cleaned_data.get('layers')]
users_usernames = [user.username for user in model_class.objects.filter(
id__in=ids)] if model == 'profile' else None
groups_names = [group_profile.group.name for group_profile in model_class.objects.filter(
Expand All @@ -121,13 +121,13 @@ def user_and_group_permission(request, model):

if permissions_names:
set_permissions.apply_async(
(permissions_names, resources_names, users_usernames, groups_names, delete_flag))
([permissions_names], resources_names, users_usernames, groups_names, delete_flag))

return HttpResponseRedirect(
get_url_for_app_model(model, model_class))

form = UserAndGroupPermissionsForm({
'permission_type': ('read', ),
'permission_type': ('read', "Read" ),
'mode': 'set',
})
return render(
Expand Down
2 changes: 1 addition & 1 deletion geonode/layers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ def set_datasets_permissions(permissions_name, resources_names=None, users_usern
from geonode.resource.manager import resource_manager
# Processing information
resources_as_pk = []
for el in resources_names:
for el in resources_names or []:
if isinstance(el, str) and not el.isnumeric():
res = Dataset.objects.filter(Q(title=el) | Q(name=el))
if res.exists():
Expand Down
1 change: 1 addition & 0 deletions geonode/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2123,6 +2123,7 @@ def get_geonode_catalogue_service():
"sync_geonode_maps",
"importlayers",
"set_all_datasets_metadata",
"set_layers_permissions",
] + ast.literal_eval(os.getenv('MANAGEMENT_COMMANDS_EXPOSED_OVER_HTTP ', '[]')))


Expand Down

0 comments on commit 5b2f2ce

Please sign in to comment.