Skip to content
This repository was archived by the owner on Jan 28, 2026. It is now read-only.

Commit a269ca8

Browse files
valipodvalipod
authored
Merge pull request #41 from eea/develop
Develop
2 parents cb62f9a + f8a2afd commit a269ca8

6 files changed

Lines changed: 80 additions & 66 deletions

File tree

‎docs/HISTORY.txt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
Changelog
22
=========
33

4-
4.0 - (2021-11-12)
4+
3.4 - (2021-11-19)
5+
---------------------------
6+
* fix PCP incorrectly shown on all sibling roles
7+
[valipod refs #140578]
8+
* update climatecangeadaptation and climatechangemitigation role names
9+
[valipod refs #140578]
10+
* fix PCP label (incorrectly shown as Mn)
11+
[valipod refs #140578]
12+
13+
3.3 - (2021-11-12)
514
---------------------------
615
* changes to support the new Eionet Groups replacing the NFP branch
716
[valipod refs #140578]

‎eea/ldapadmin/constants.py‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,55 @@
3939
'first_name', 'organisation', 'department', 'email', 'metadata', 'dn',
4040
'fax', 'postal_address', 'phone', 'employeeNumber', 'modifyTimestamp',
4141
'mobile', 'full_name_native', 'pwdChangedTime', 'url', 'createTimestamp',
42-
'job_title', 'search_helper']
42+
'job_title', 'search_helper'
43+
]
44+
45+
EXTRANET_REPORTER_ROLES = [
46+
'extranet-aqipr-h2k',
47+
'extranet-aqipr-utd',
48+
'extranet-aqipr-val',
49+
'extranet-birds-art12data',
50+
'extranet-bwd-data',
51+
'extranet-clrtap-reporter',
52+
'extranet-co2monitoring-reporter',
53+
'extranet-dwd-data',
54+
'extranet-emerald-reporter',
55+
'extranet-energycommunity',
56+
'extranet-eprtrlcp-data',
57+
'extranet-ets-art21reporter',
58+
'extranet-euregistry-reporter',
59+
'extranet-floods-data',
60+
'extranet-fqd-reporter',
61+
'extranet-habides-reporter',
62+
'extranet-habitats-art17data',
63+
'extranet-ias-reporter',
64+
'extranet-ied-ieddat',
65+
'extranet-inspire-reporter',
66+
'extranet-mcp-reporter',
67+
'extranet-mercury-reporter',
68+
'extranet-mmr-reporter',
69+
'extranet-msfdreporter-data',
70+
'extranet-natura2000-reporter',
71+
'extranet-necd-reporter',
72+
'extranet-nid-reporter',
73+
'extranet-noise-reporter',
74+
'extranet-res8-reporters',
75+
'extranet-uwwtd-data',
76+
'extranet-wfd-data'
77+
]
78+
79+
EIONET_GROUPS = [
80+
"eionet-biodiversity1",
81+
"eionet-biodiversity2",
82+
"eionet-circulareconomy",
83+
"eionet-climatecangeadaptation"
84+
"eionet-clmatechangemitigation",
85+
"eionet-communication",
86+
"eionet-data",
87+
"eionet-foodsystems",
88+
"eionet-foresight",
89+
"eionet-health",
90+
"eionet-landsystems",
91+
"eionet-mobility",
92+
"eionet-soe",
93+
]

‎eea/ldapadmin/nfp_nrc.py‎

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from Products.statusmessages.interfaces import IStatusMessage
2222

2323
from eea import usersdb
24+
from eea.ldapadmin.constants import EXTRANET_REPORTER_ROLES, EIONET_GROUPS
2425
from eea.ldapadmin.countries import get_country
2526
from eea.ldapadmin.users_admin import eionet_edit_users
2627
from eea.ldapadmin import ldap_config
@@ -60,56 +61,6 @@ def manage_add_nfp_nrc(parent, tool_id, REQUEST=None):
6061
del user_info_edit_schema['last_name']
6162

6263

63-
EXTRANET_REPORTER_ROLES = [
64-
'extranet-aqipr-h2k',
65-
'extranet-aqipr-utd',
66-
'extranet-aqipr-val',
67-
'extranet-birds-art12data',
68-
'extranet-bwd-data',
69-
'extranet-clrtap-reporter',
70-
'extranet-co2monitoring-reporter',
71-
'extranet-dwd-data',
72-
'extranet-emerald-reporter',
73-
'extranet-energycommunity',
74-
'extranet-eprtrlcp-data',
75-
'extranet-ets-art21reporter',
76-
'extranet-euregistry-reporter',
77-
'extranet-floods-data',
78-
'extranet-fqd-reporter',
79-
'extranet-habides-reporter',
80-
'extranet-habitats-art17data',
81-
'extranet-ias-reporter',
82-
'extranet-ied-ieddat',
83-
'extranet-inspire-reporter',
84-
'extranet-mcp-reporter',
85-
'extranet-mercury-reporter',
86-
'extranet-mmr-reporter',
87-
'extranet-msfdreporter-data',
88-
'extranet-natura2000-reporter',
89-
'extranet-necd-reporter',
90-
'extranet-nid-reporter',
91-
'extranet-noise-reporter',
92-
'extranet-res8-reporters',
93-
'extranet-uwwtd-data',
94-
'extranet-wfd-data'
95-
]
96-
97-
98-
EIONET_GROUPS = ["eionet-biodiversity1",
99-
"eionet-biodiversity2",
100-
"eionet-circulareconomy",
101-
"eionet-climatechange",
102-
"eionet-communication",
103-
"eionet-data",
104-
"eionet-foodsystems",
105-
"eionet-foresight",
106-
"eionet-health",
107-
"eionet-landsystems",
108-
"eionet-mobility",
109-
"eionet-soe",
110-
]
111-
112-
11364
def code_to_name(country_code):
11465
''' return country name from iso code '''
11566
return get_country(country_code)['name']

‎eea/ldapadmin/roles_leaders.py‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
66
"""
77
import re
8+
from eea.ldapadmin.constants import EIONET_GROUPS
89

910

1011
# Configurations
@@ -19,14 +20,16 @@ def naming(role_id):
1920
'short': 'Dep'},
2021
'generic_pl': 'official representatives'
2122
}
22-
elif re.match('eionet-nrc-[^-]+-[mc]c-[^-]+', role_id):
23-
return {
24-
'leader': {'long': 'Primary Contact Point',
25-
'short': 'PCP'},
26-
'alternate': {'long': 'Alternate Contact Point',
27-
'short': 'ACP'},
28-
'generic_pl': 'primary contact points'
29-
}
23+
else:
24+
for eionet_group in EIONET_GROUPS:
25+
if re.match(eionet_group, role_id):
26+
return {
27+
'leader': {'long': 'Primary Contact Point',
28+
'short': 'PCP'},
29+
'alternate': {'long': 'Alternate Contact Point',
30+
'short': 'ACP'},
31+
'generic_pl': 'primary contact points'
32+
}
3033
return {
3134
'leader': {'long': 'Maintainer',
3235
'short': 'Mn'},

‎eea/ldapadmin/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3
1+
3.4

‎eea/ldapadmin/www/role_leaders.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ $(function () {
4545
// for setting PCPs in NFP-NRC tool
4646
$('div#role_listing').on('click', 'div.nrc_role input[class=leader]', function(){
4747
var checkb = $(this);
48-
var role_div = checkb.parents("div.nrc_role");
49-
var role_id = role_div.children('h3').attr("id");
48+
var role_table = checkb.parents("table");
49+
var role_id = role_table.prev('h3').attr("id");
5050
var user_id = checkb.val();
5151
$.post("set_pcp", {"role_id": role_id, "user_id": user_id},
5252
function (data){
53-
var all_radios = $("input[class=leader]", role_div);
54-
$("span.leader_container", role_div).hide();
53+
var all_radios = $("input[class=leader]", role_table);
54+
$("span.leader_container", role_table).hide();
5555
all_radios.attr("checked", false);
56-
var selected = $("input:radio[value=" + data.pcp + "]", role_div);
56+
var selected = $("input:radio[value=" + data.pcp + "]", role_table);
5757
if (selected) {
5858
selected.attr("checked", true);
5959
selected.siblings("span.leader_container").show();

0 commit comments

Comments
 (0)