Skip to content

Commit 093ea1d

Browse files
edivalentinituedivalentinitu
committed
vocabulary: license short_name
1 parent 70815e5 commit 093ea1d

5 files changed

Lines changed: 33 additions & 64 deletions

File tree

‎invenio_records_lom/fixtures/demo.py‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -297,27 +297,13 @@ def create_fake_learningresourcetype(fake: Faker) -> dict:
297297
def create_fake_rights(fake: Faker) -> dict:
298298
"""Create a fake "rights"-element, compatible with LOMv1.0."""
299299
urls = {
300-
"https://creativecommons.org/publicdomain/zero/1.0/": _(
301-
"CC0 1.0 - Creative Commons CC0 1.0 Universal",
302-
),
303-
"https://creativecommons.org/licenses/by/4.0/": _(
304-
"CC BY 4.0 - Creative Commons Attribution 4.0 International",
305-
),
306-
"https://creativecommons.org/licenses/by-sa/4.0/": _(
307-
"CC BY-SA 4.0 - Creative Commons Attribution Share-Alike 4.0 International",
308-
),
309-
"https://creativecommons.org/licenses/by-nd/4.0/": _(
310-
"CC BY-ND 4.0 - Creative Commons Attribution No-Derivatives 4.0 International",
311-
),
312-
"https://creativecommons.org/licenses/by-nc/4.0/": _(
313-
"CC BY-NC 4.0 - Creative Commons Attribution Non-Commercial 4.0 International",
314-
),
315-
"https://creativecommons.org/licenses/by-nc-sa/4.0/": _(
316-
"CC BY-NC-SA 4.0 - Creative Commons Attribution Non-Commercial Share-Alike 4.0 International",
317-
),
318-
"https://creativecommons.org/licenses/by-nc-nd/4.0/": _(
319-
"CC BY-NC-ND 4.0 - Creative Commons Attribution Non-Commercial No-Derivatives 4.0 International",
320-
),
300+
"https://creativecommons.org/publicdomain/zero/1.0/": "CC0 1.0",
301+
"https://creativecommons.org/licenses/by/4.0/": "CC BY 4.0",
302+
"https://creativecommons.org/licenses/by-sa/4.0/": "CC BY-SA 4.0",
303+
"https://creativecommons.org/licenses/by-nd/4.0/": "CC BY-ND 4.0",
304+
"https://creativecommons.org/licenses/by-nc/4.0/": "CC BY-NC 4.0",
305+
"https://creativecommons.org/licenses/by-nc-sa/4.0/": "CC BY-NC-SA 4.0",
306+
"https://creativecommons.org/licenses/by-nc-nd/4.0/": "CC BY-NC-ND 4.0",
321307
}
322308
url, name = fake.random.choice(list(urls.items()))
323309
lang = "x-t-cc-url" if url.startswith("https://creativecommons.org/") else None

‎invenio_records_lom/resources/serializers/utils.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
def get_text(value: dict) -> str:
1212
"""Get text from langstring object."""
1313
try:
14+
if type(value) != dict:
15+
return ""
1416
return value["langstring"]["#text"]
1517
except (KeyError, TypeError):
1618
return ""

‎invenio_records_lom/ui/records/deposits.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,31 @@ def get_deposit_template_context(**extra_form_config_kwargs: dict) -> dict:
3939
license_vocabulary = {
4040
"https://creativecommons.org/publicdomain/zero/1.0/": {
4141
"name": "CC0 1.0 - Creative Commons CC0 1.0 Universal",
42+
"short_name": "CC0 1.0",
4243
},
4344
"https://creativecommons.org/licenses/by/4.0/": {
4445
"name": "CC BY 4.0 - Creative Commons Attribution 4.0 International",
46+
"short_name": "CC BY 4.0",
4547
},
4648
"https://creativecommons.org/licenses/by-nc/4.0/": {
4749
"name": "CC BY-NC 4.0 - Creative Commons Attribution Non-Commercial 4.0 International",
50+
"short_name": "CC BY-NC 4.0",
4851
},
4952
"https://creativecommons.org/licenses/by-nc-nd/4.0/": {
5053
"name": "CC BY-NC-ND 4.0 - Creative Commons Attribution Non-Commercial No-Derivatives 4.0 International",
54+
"short_name": "CC BY-NC-ND 4.0",
5155
},
5256
"https://creativecommons.org/licenses/by-nc-sa/4.0/": {
5357
"name": "CC BY-NC-SA 4.0 - Creative Commons Attribution Non-Commercial Share-Alike 4.0 International",
58+
"short_name": "CC BY-NC-SA 4.0",
5459
},
5560
"https://creativecommons.org/licenses/by-nd/4.0/": {
5661
"name": "CC BY-ND 4.0 - Creative Commons Attribution No-Derivatives 4.0 International",
62+
"short_name": "CC BY-ND 4.0",
5763
},
5864
"https://creativecommons.org/licenses/by-sa/4.0/": {
5965
"name": "CC BY-SA 4.0 - Creative Commons Attribution Share-Alike 4.0 International",
66+
"short_name": "CC BY-SA 4.0",
6067
},
6168
}
6269
contributor_vocabulary = {

‎invenio_records_lom/ui/theme/assets/semantic-ui/js/invenio_records_lom/deposit/fields.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,9 @@ const InnerDropdownField = ({
274274
fieldHelpers.setValue(value);
275275

276276
const selectedVocabulary = vocabulary[value];
277-
if (selectedVocabulary) {
277+
if (selectedVocabulary && selectedVocabulary.short_name != null) {
278+
setFieldValue(`${fieldPath}.name`, selectedVocabulary.short_name);
279+
} else {
278280
setFieldValue(`${fieldPath}.name`, selectedVocabulary.name);
279281
}
280282
}}

‎invenio_records_lom/upgrade_scripts/migrate_0_19_to_0_20.py‎

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -39,66 +39,38 @@ def get_new_json(old_json: dict) -> dict | None:
3939
"""
4040
license_vocabulary = {
4141
"https://creativecommons.org/publicdomain/zero/1.0/": {
42-
"name": "CC0 1.0 - Creative Commons CC0 1.0 Universal",
42+
"name": "CC0 1.0",
4343
},
4444
"https://creativecommons.org/licenses/by/4.0/": {
45-
"name": _("CC BY 4.0 - Creative Commons Attribution 4.0 International"),
45+
"name": "CC BY 4.0",
4646
},
4747
"https://creativecommons.org/licenses/by-nc/4.0/": {
48-
"name": _(
49-
"CC BY-NC 4.0 - Creative Commons Attribution Non-Commercial 4.0 International",
50-
),
48+
"name": "CC BY-NC 4.0",
5149
},
5250
"https://creativecommons.org/licenses/by-nc-nd/4.0/": {
53-
"name": _(
54-
"CC BY-NC-ND 4.0 - Creative Commons Attribution Non-Commercial No-Derivatives 4.0 International",
55-
),
51+
"name": "CC BY-NC-ND 4.0"
5652
},
5753
"https://creativecommons.org/licenses/by-nc-sa/4.0/": {
58-
"name": _(
59-
"CC BY-NC-SA 4.0 - Creative Commons Attribution Non-Commercial Share-Alike 4.0 International",
60-
),
61-
},
62-
"https://creativecommons.org/licenses/by-nd/4.0/": {
63-
"name": _(
64-
"CC BY-ND 4.0 - Creative Commons Attribution No-Derivatives 4.0 International",
65-
),
66-
},
67-
"https://creativecommons.org/licenses/by-sa/4.0/": {
68-
"name": _(
69-
"CC BY-SA 4.0 - Creative Commons Attribution Share-Alike 4.0 International",
70-
),
54+
"name": "CC BY-NC-SA 4.0"
7155
},
56+
"https://creativecommons.org/licenses/by-nd/4.0/": {"name": "CC BY-ND 4.0"},
57+
"https://creativecommons.org/licenses/by-sa/4.0/": {"name": "CC BY-SA 4.0"},
7258
# some seem 2 times, but this is because the lack of final slash character ("/") - demo data from v0.19
7359
"https://creativecommons.org/licenses/by/4.0": {
74-
"name": _("CC BY 4.0 - Creative Commons Attribution 4.0 International"),
75-
},
76-
"https://creativecommons.org/licenses/by-nc/4.0": {
77-
"name": _(
78-
"CC BY-NC 4.0 - Creative Commons Attribution Non-Commercial 4.0 International",
79-
),
60+
"name": "CC BY 4.0",
8061
},
62+
"https://creativecommons.org/licenses/by-nc/4.0": {"name": "CC BY-NC 4.0"},
8163
"https://creativecommons.org/licenses/by-nc-nd/4.0": {
82-
"name": _(
83-
"CC BY-NC-ND 4.0 - Creative Commons Attribution Non-Commercial No-Derivatives 4.0 International",
84-
),
64+
"name": "CC BY-NC-ND 4.0"
8565
},
8666
"https://creativecommons.org/licenses/by-nc-sa/4.0": {
87-
"name": _(
88-
"CC BY-NC-SA 4.0 - Creative Commons Attribution Non-Commercial Share-Alike 4.0 International",
89-
),
67+
"name": "CC BY-NC-SA 4.0"
9068
},
9169
"https://creativecommons.org/licenses/by-nd/4.0": {
92-
"name": _(
93-
"CC BY-ND 4.0 - Creative Commons Attribution No-Derivatives 4.0 International",
94-
),
95-
},
96-
"https://creativecommons.org/licenses/by-sa/4.0": {
97-
"name": _(
98-
"CC BY-SA 4.0 - Creative Commons Attribution Share-Alike 4.0 International",
99-
),
70+
"name": "CC BY-ND 4.0",
10071
},
101-
"https://mit-license.org/": {"name": _("MIT License")},
72+
"https://creativecommons.org/licenses/by-sa/4.0": {"name": "CC BY-SA 4.0"},
73+
"https://mit-license.org/": {"name": "MIT"},
10274
}
10375

10476
property_to_add = "name"

0 commit comments

Comments
 (0)