diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 211d533c..9d001136 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,7 +1,16 @@ Changelog ========= -4.0 - (2021-11-12) +3.4 - (2021-11-19) +--------------------------- +* fix PCP incorrectly shown on all sibling roles + [valipod refs #140578] +* update climatecangeadaptation and climatechangemitigation role names + [valipod refs #140578] +* fix PCP label (incorrectly shown as Mn) + [valipod refs #140578] + +3.3 - (2021-11-12) --------------------------- * changes to support the new Eionet Groups replacing the NFP branch [valipod refs #140578] diff --git a/eea/ldapadmin/constants.py b/eea/ldapadmin/constants.py index 62474e8d..76d9c612 100644 --- a/eea/ldapadmin/constants.py +++ b/eea/ldapadmin/constants.py @@ -39,4 +39,55 @@ 'first_name', 'organisation', 'department', 'email', 'metadata', 'dn', 'fax', 'postal_address', 'phone', 'employeeNumber', 'modifyTimestamp', 'mobile', 'full_name_native', 'pwdChangedTime', 'url', 'createTimestamp', - 'job_title', 'search_helper'] + 'job_title', 'search_helper' +] + +EXTRANET_REPORTER_ROLES = [ + 'extranet-aqipr-h2k', + 'extranet-aqipr-utd', + 'extranet-aqipr-val', + 'extranet-birds-art12data', + 'extranet-bwd-data', + 'extranet-clrtap-reporter', + 'extranet-co2monitoring-reporter', + 'extranet-dwd-data', + 'extranet-emerald-reporter', + 'extranet-energycommunity', + 'extranet-eprtrlcp-data', + 'extranet-ets-art21reporter', + 'extranet-euregistry-reporter', + 'extranet-floods-data', + 'extranet-fqd-reporter', + 'extranet-habides-reporter', + 'extranet-habitats-art17data', + 'extranet-ias-reporter', + 'extranet-ied-ieddat', + 'extranet-inspire-reporter', + 'extranet-mcp-reporter', + 'extranet-mercury-reporter', + 'extranet-mmr-reporter', + 'extranet-msfdreporter-data', + 'extranet-natura2000-reporter', + 'extranet-necd-reporter', + 'extranet-nid-reporter', + 'extranet-noise-reporter', + 'extranet-res8-reporters', + 'extranet-uwwtd-data', + 'extranet-wfd-data' +] + +EIONET_GROUPS = [ + "eionet-biodiversity1", + "eionet-biodiversity2", + "eionet-circulareconomy", + "eionet-climatecangeadaptation" + "eionet-clmatechangemitigation", + "eionet-communication", + "eionet-data", + "eionet-foodsystems", + "eionet-foresight", + "eionet-health", + "eionet-landsystems", + "eionet-mobility", + "eionet-soe", +] diff --git a/eea/ldapadmin/nfp_nrc.py b/eea/ldapadmin/nfp_nrc.py index 6ced5ac1..dec1529b 100644 --- a/eea/ldapadmin/nfp_nrc.py +++ b/eea/ldapadmin/nfp_nrc.py @@ -21,6 +21,7 @@ from Products.statusmessages.interfaces import IStatusMessage from eea import usersdb +from eea.ldapadmin.constants import EXTRANET_REPORTER_ROLES, EIONET_GROUPS from eea.ldapadmin.countries import get_country from eea.ldapadmin.users_admin import eionet_edit_users from eea.ldapadmin import ldap_config @@ -60,56 +61,6 @@ def manage_add_nfp_nrc(parent, tool_id, REQUEST=None): del user_info_edit_schema['last_name'] -EXTRANET_REPORTER_ROLES = [ - 'extranet-aqipr-h2k', - 'extranet-aqipr-utd', - 'extranet-aqipr-val', - 'extranet-birds-art12data', - 'extranet-bwd-data', - 'extranet-clrtap-reporter', - 'extranet-co2monitoring-reporter', - 'extranet-dwd-data', - 'extranet-emerald-reporter', - 'extranet-energycommunity', - 'extranet-eprtrlcp-data', - 'extranet-ets-art21reporter', - 'extranet-euregistry-reporter', - 'extranet-floods-data', - 'extranet-fqd-reporter', - 'extranet-habides-reporter', - 'extranet-habitats-art17data', - 'extranet-ias-reporter', - 'extranet-ied-ieddat', - 'extranet-inspire-reporter', - 'extranet-mcp-reporter', - 'extranet-mercury-reporter', - 'extranet-mmr-reporter', - 'extranet-msfdreporter-data', - 'extranet-natura2000-reporter', - 'extranet-necd-reporter', - 'extranet-nid-reporter', - 'extranet-noise-reporter', - 'extranet-res8-reporters', - 'extranet-uwwtd-data', - 'extranet-wfd-data' -] - - -EIONET_GROUPS = ["eionet-biodiversity1", - "eionet-biodiversity2", - "eionet-circulareconomy", - "eionet-climatechange", - "eionet-communication", - "eionet-data", - "eionet-foodsystems", - "eionet-foresight", - "eionet-health", - "eionet-landsystems", - "eionet-mobility", - "eionet-soe", - ] - - def code_to_name(country_code): ''' return country name from iso code ''' return get_country(country_code)['name'] diff --git a/eea/ldapadmin/roles_leaders.py b/eea/ldapadmin/roles_leaders.py index 6701fbbe..32860356 100644 --- a/eea/ldapadmin/roles_leaders.py +++ b/eea/ldapadmin/roles_leaders.py @@ -5,6 +5,7 @@ """ import re +from eea.ldapadmin.constants import EIONET_GROUPS # Configurations @@ -19,14 +20,16 @@ def naming(role_id): 'short': 'Dep'}, 'generic_pl': 'official representatives' } - elif re.match('eionet-nrc-[^-]+-[mc]c-[^-]+', role_id): - return { - 'leader': {'long': 'Primary Contact Point', - 'short': 'PCP'}, - 'alternate': {'long': 'Alternate Contact Point', - 'short': 'ACP'}, - 'generic_pl': 'primary contact points' - } + else: + for eionet_group in EIONET_GROUPS: + if re.match(eionet_group, role_id): + return { + 'leader': {'long': 'Primary Contact Point', + 'short': 'PCP'}, + 'alternate': {'long': 'Alternate Contact Point', + 'short': 'ACP'}, + 'generic_pl': 'primary contact points' + } return { 'leader': {'long': 'Maintainer', 'short': 'Mn'}, diff --git a/eea/ldapadmin/version.txt b/eea/ldapadmin/version.txt index eb39e538..2f4b6075 100644 --- a/eea/ldapadmin/version.txt +++ b/eea/ldapadmin/version.txt @@ -1 +1 @@ -3.3 +3.4 diff --git a/eea/ldapadmin/www/role_leaders.js b/eea/ldapadmin/www/role_leaders.js index 3400b9ad..5a3c08b6 100644 --- a/eea/ldapadmin/www/role_leaders.js +++ b/eea/ldapadmin/www/role_leaders.js @@ -45,15 +45,15 @@ $(function () { // for setting PCPs in NFP-NRC tool $('div#role_listing').on('click', 'div.nrc_role input[class=leader]', function(){ var checkb = $(this); - var role_div = checkb.parents("div.nrc_role"); - var role_id = role_div.children('h3').attr("id"); + var role_table = checkb.parents("table"); + var role_id = role_table.prev('h3').attr("id"); var user_id = checkb.val(); $.post("set_pcp", {"role_id": role_id, "user_id": user_id}, function (data){ - var all_radios = $("input[class=leader]", role_div); - $("span.leader_container", role_div).hide(); + var all_radios = $("input[class=leader]", role_table); + $("span.leader_container", role_table).hide(); all_radios.attr("checked", false); - var selected = $("input:radio[value=" + data.pcp + "]", role_div); + var selected = $("input:radio[value=" + data.pcp + "]", role_table); if (selected) { selected.attr("checked", true); selected.siblings("span.leader_container").show();