From 3e2d622aeeb5e221280f9b2d80a13426a012ef94 Mon Sep 17 00:00:00 2001 From: David de Boer Date: Mon, 1 May 2017 09:44:38 +0200 Subject: [PATCH] mod_acl_user_groups: Fix non-admins denied permission to upload file (#1665) (cherry picked from commit ac7094d381ada345fadc536d24a6e697f77b4834) --- .../action_admin_dialog_media_upload.erl | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/mod_admin/actions/action_admin_dialog_media_upload.erl b/modules/mod_admin/actions/action_admin_dialog_media_upload.erl index bed8207275..aaa6e7bc20 100644 --- a/modules/mod_admin/actions/action_admin_dialog_media_upload.erl +++ b/modules/mod_admin/actions/action_admin_dialog_media_upload.erl @@ -109,17 +109,21 @@ event(#submit{message={media_url, EventProps}}, Context) -> add_content_group(EventProps, Props, Context) -> - case proplists:get_value(subject_id, EventProps) of + case content_group_id( + proplists:get_value(content_group_id, EventProps), + proplists:get_value(subject_id, EventProps), + Context + ) of undefined -> - [ {content_group_id, proplists:get_value(content_group_id, EventProps)} | Props ]; - SubjectId when is_integer(SubjectId) -> - ContentGroupdId = case proplists:get_value(content_group_id, EventProps) of - undefined -> m_rsc:p_no_acl(SubjectId, content_group_id, Context); - CGId -> CGId - end, - [ {content_group_id, ContentGroupdId} | Props ] + Props; + ContentGroupId -> + [{content_group_id, ContentGroupId} | Props] end. +content_group_id(undefined, SubjectId, Context) when is_integer(SubjectId) -> + m_rsc:p_no_acl(SubjectId, content_group_id, Context); +content_group_id(ContentGroupId, _SubjectId, _Context) -> + ContentGroupId. %% Handling the media upload. handle_media_upload(EventProps, Context, InsertFun, ReplaceFun) ->