diff --git a/knora/excel2xml.py b/knora/excel2xml.py index 784c8b2f3..95e5ca5f8 100644 --- a/knora/excel2xml.py +++ b/knora/excel2xml.py @@ -329,29 +329,29 @@ def append_permissions(root_element: etree.Element) -> etree._Element: res_default = etree.Element("{%s}permissions" % (xml_namespace_map[None]), id="res-default") res_default.append(ALLOW("V", group="UnknownUser")) res_default.append(ALLOW("V", group="KnownUser")) - res_default.append(ALLOW("CR", group="Creator")) + res_default.append(ALLOW("D", group="ProjectMember")) res_default.append(ALLOW("CR", group="ProjectAdmin")) + res_default.append(ALLOW("CR", group="Creator")) root_element.append(res_default) res_restricted = PERMISSIONS(id="res-restricted") - res_restricted.append(ALLOW("RV", group="UnknownUser")) - res_restricted.append(ALLOW("V", group="KnownUser")) - res_restricted.append(ALLOW("CR", group="Creator")) + res_restricted.append(ALLOW("M", group="ProjectMember")) res_restricted.append(ALLOW("CR", group="ProjectAdmin")) + res_restricted.append(ALLOW("CR", group="Creator")) root_element.append(res_restricted) prop_default = PERMISSIONS(id="prop-default") prop_default.append(ALLOW("V", group="UnknownUser")) prop_default.append(ALLOW("V", group="KnownUser")) - prop_default.append(ALLOW("CR", group="Creator")) + prop_default.append(ALLOW("D", group="ProjectMember")) prop_default.append(ALLOW("CR", group="ProjectAdmin")) + prop_default.append(ALLOW("CR", group="Creator")) root_element.append(prop_default) prop_restricted = PERMISSIONS(id="prop-restricted") - prop_restricted.append(ALLOW("RV", group="UnknownUser")) - prop_restricted.append(ALLOW("V", group="KnownUser")) - prop_restricted.append(ALLOW("CR", group="Creator")) + prop_restricted.append(ALLOW("M", group="ProjectMember")) prop_restricted.append(ALLOW("CR", group="ProjectAdmin")) + prop_restricted.append(ALLOW("CR", group="Creator")) root_element.append(prop_restricted) return root_element diff --git a/testdata/0123-data-processed-expected.xml b/testdata/0123-data-processed-expected.xml index 212c9a295..f1c1b54e3 100644 --- a/testdata/0123-data-processed-expected.xml +++ b/testdata/0123-data-processed-expected.xml @@ -3,26 +3,26 @@ V V - CR + D CR + CR - RV - V - CR + M CR + CR V V - CR + D CR + CR - RV - V - CR + M CR + CR images/Anubis.jpg diff --git a/testdata/excel2xml-expected-output.xml b/testdata/excel2xml-expected-output.xml index 9a3e488b7..771148241 100644 --- a/testdata/excel2xml-expected-output.xml +++ b/testdata/excel2xml-expected-output.xml @@ -3,26 +3,26 @@ V V - CR + D CR + CR - RV - V - CR + M CR + CR V V - CR + D CR + CR - RV - V - CR + M CR + CR