Skip to content

GitLab

Commit 84d06205 authored by Yann Voté's avatar Yann Voté
Browse files

[ui] Merge advanced tab into main tab

parent c91a877c45c9
Hide whitespace changes
Inline Side-by-side
i18n/en.po
View file @ 4dfef375
......@@ -900,6 +900,14 @@ msgstr ""
msgid "SEDADescription"
msgstr ""
msgctxt "inlined:SEDAContent.seda_description.object"
msgid "SEDADescription"
msgstr ""
msgid "SEDADescriptionLanguage"
msgstr ""
msgctxt "inlined:SEDAContent.seda_description_language_from.object"
msgid "SEDADescriptionLanguage"
msgstr ""
......@@ -930,6 +938,10 @@ msgstr ""
msgid "SEDADocumentType"
msgstr ""
msgctxt "inlined:SEDAContent.seda_document_type.object"
msgid "SEDADocumentType"
msgstr ""
msgid "SEDADocumentType_plural"
msgstr ""
......@@ -1116,6 +1128,10 @@ msgstr ""
msgid "SEDALanguage"
msgstr ""
msgctxt "inlined:SEDAContent.seda_language_from.object"
msgid "SEDALanguage"
msgstr ""
msgid "SEDALanguage_plural"
msgstr ""
......@@ -1556,6 +1572,10 @@ msgstr ""
msgid "SEDAStatus"
msgstr ""
msgctxt "inlined:SEDAContent.seda_status.object"
msgid "SEDAStatus"
msgstr ""
msgid "SEDAStatus_plural"
msgstr ""
......@@ -1637,6 +1657,10 @@ msgstr ""
msgid "SEDAType"
msgstr ""
msgctxt "inlined:SEDAContent.seda_type.object"
msgid "SEDAType"
msgstr ""
msgid "SEDAType_plural"
msgstr ""
......@@ -1657,6 +1681,10 @@ msgstr ""
msgid "SEDAVersion"
msgstr ""
msgctxt "inlined:SEDAContent.seda_version.object"
msgid "SEDAVersion"
msgstr ""
msgid "SEDAVersion_plural"
msgstr ""
......@@ -2863,6 +2891,14 @@ msgstr ""
msgid "add a SEDADescription"
msgstr ""
msgctxt "inlined:SEDAContent.seda_description.object"
msgid "add a SEDADescription"
msgstr ""
msgid "add a SEDADescriptionLanguage"
msgstr ""
msgctxt "inlined:SEDAContent.seda_description_language_from.object"
msgid "add a SEDADescriptionLanguage"
msgstr ""
......@@ -2878,6 +2914,10 @@ msgstr ""
msgid "add a SEDADocumentType"
msgstr ""
msgctxt "inlined:SEDAContent.seda_document_type.object"
msgid "add a SEDADocumentType"
msgstr ""
msgid "add a SEDAEncoding"
msgstr ""
......@@ -2983,6 +3023,10 @@ msgstr ""
msgid "add a SEDALanguage"
msgstr ""
msgctxt "inlined:SEDAContent.seda_language_from.object"
msgid "add a SEDALanguage"
msgstr ""
msgid "add a SEDALastModified"
msgstr ""
......@@ -3300,6 +3344,10 @@ msgstr ""
msgid "add a SEDAStatus"
msgstr ""
msgctxt "inlined:SEDAContent.seda_status.object"
msgid "add a SEDAStatus"
msgstr ""
msgid "add a SEDAStorageRule"
msgstr ""
......@@ -3345,6 +3393,10 @@ msgstr ""
msgid "add a SEDAType"
msgstr ""
msgctxt "inlined:SEDAContent.seda_type.object"
msgid "add a SEDAType"
msgstr ""
msgid "add a SEDAUri"
msgstr ""
......@@ -3359,6 +3411,10 @@ msgstr ""
msgid "add a SEDAVersion"
msgstr ""
msgctxt "inlined:SEDAContent.seda_version.object"
msgid "add a SEDAVersion"
msgstr ""
msgid "add a SEDAWeight"
msgstr ""
......@@ -4986,9 +5042,6 @@ msgctxt "SEDAContent"
msgid "seda_content"
msgstr ""
msgid "seda_content_advanced_description_tab"
msgstr ""
msgid "seda_content_agent_tab"
msgstr ""
......
i18n/fr.po
View file @ 4dfef375
......@@ -903,6 +903,14 @@ msgstr ""
msgid "SEDADescription"
msgstr ""
msgctxt "inlined:SEDAContent.seda_description.object"
msgid "SEDADescription"
msgstr ""
msgid "SEDADescriptionLanguage"
msgstr ""
msgctxt "inlined:SEDAContent.seda_description_language_from.object"
msgid "SEDADescriptionLanguage"
msgstr ""
......@@ -933,6 +941,10 @@ msgstr ""
msgid "SEDADocumentType"
msgstr ""
msgctxt "inlined:SEDAContent.seda_document_type.object"
msgid "SEDADocumentType"
msgstr ""
msgid "SEDADocumentType_plural"
msgstr ""
......@@ -1119,6 +1131,10 @@ msgstr ""
msgid "SEDALanguage"
msgstr ""
msgctxt "inlined:SEDAContent.seda_language_from.object"
msgid "SEDALanguage"
msgstr ""
msgid "SEDALanguage_plural"
msgstr ""
......@@ -1559,6 +1575,10 @@ msgstr ""
msgid "SEDAStatus"
msgstr ""
msgctxt "inlined:SEDAContent.seda_status.object"
msgid "SEDAStatus"
msgstr ""
msgid "SEDAStatus_plural"
msgstr ""
......@@ -1640,6 +1660,10 @@ msgstr ""
msgid "SEDAType"
msgstr ""
msgctxt "inlined:SEDAContent.seda_type.object"
msgid "SEDAType"
msgstr ""
msgid "SEDAType_plural"
msgstr ""
......@@ -1660,6 +1684,10 @@ msgstr ""
msgid "SEDAVersion"
msgstr ""
msgctxt "inlined:SEDAContent.seda_version.object"
msgid "SEDAVersion"
msgstr ""
msgid "SEDAVersion_plural"
msgstr ""
......@@ -2866,6 +2894,14 @@ msgstr ""
msgid "add a SEDADescription"
msgstr ""
msgctxt "inlined:SEDAContent.seda_description.object"
msgid "add a SEDADescription"
msgstr ""
msgid "add a SEDADescriptionLanguage"
msgstr ""
msgctxt "inlined:SEDAContent.seda_description_language_from.object"
msgid "add a SEDADescriptionLanguage"
msgstr ""
......@@ -2881,6 +2917,10 @@ msgstr ""
msgid "add a SEDADocumentType"
msgstr ""
msgctxt "inlined:SEDAContent.seda_document_type.object"
msgid "add a SEDADocumentType"
msgstr ""
msgid "add a SEDAEncoding"
msgstr ""
......@@ -2986,6 +3026,10 @@ msgstr ""
msgid "add a SEDALanguage"
msgstr ""
msgctxt "inlined:SEDAContent.seda_language_from.object"
msgid "add a SEDALanguage"
msgstr ""
msgid "add a SEDALastModified"
msgstr ""
......@@ -3303,6 +3347,10 @@ msgstr ""
msgid "add a SEDAStatus"
msgstr ""
msgctxt "inlined:SEDAContent.seda_status.object"
msgid "add a SEDAStatus"
msgstr ""
msgid "add a SEDAStorageRule"
msgstr ""
......@@ -3348,6 +3396,10 @@ msgstr ""
msgid "add a SEDAType"
msgstr ""
msgctxt "inlined:SEDAContent.seda_type.object"
msgid "add a SEDAType"
msgstr ""
msgid "add a SEDAUri"
msgstr "ajouter une URI"
......@@ -3362,6 +3414,10 @@ msgstr ""
msgid "add a SEDAVersion"
msgstr ""
msgctxt "inlined:SEDAContent.seda_version.object"
msgid "add a SEDAVersion"
msgstr ""
msgid "add a SEDAWeight"
msgstr ""
......@@ -4994,9 +5050,6 @@ msgctxt "SEDAContent"
msgid "seda_content"
msgstr "unité d'archive"
msgid "seda_content_advanced_description_tab"
msgstr "avancé"
msgid "seda_content_agent_tab"
msgstr "agents"
......
views/content.py
View file @ 4dfef375
......@@ -28,17 +28,20 @@ _ = unicode
pvs = uicfg.primaryview_section
afs = uicfg.autoform_section
pvs.tag_subject_of(('SEDAContent', 'seda_description_level', '*'), 'attributes')
afs.tag_subject_of(('SEDAContent', 'seda_description_level', '*'), 'main', 'attributes')
for rtype in ('seda_description',
'seda_type',
'seda_document_type',
'seda_language_from',
'seda_description_language_from',
'seda_status',
'seda_version',
):
pvs.tag_object_of(('*', rtype, 'SEDAContent'), 'attributes')
afs.tag_object_of(('*', 'seda_description_level', 'SEDAContent'), 'main', 'attributes')
# Tabs fields
description_rtype_role = [
('seda_description_level', 'subject'),
('seda_description', 'object'),
('seda_type', 'object'),
('seda_document_type', 'object'),
('seda_language_from', 'object'),
('seda_description_language_from', 'object'),
('seda_status', 'object'),
('seda_version', 'object'),
]
identification_rtype_role = [
('seda_source', 'object'),
......@@ -111,8 +114,7 @@ history_rtype_role = [
]
# Remove from relations section and autoform what is shown in tabs
for rtype, role in (itertools.chain(description_rtype_role,
identification_rtype_role,
for rtype, role in (itertools.chain(identification_rtype_role,
service_rtype_role,
agent_rtype_role,
coverage_rtype_role,
......@@ -133,7 +135,6 @@ class ContentTabbedPrimaryView(tabs.TabbedPrimaryView):
tabs = [
'main_tab',
_('seda_content_advanced_description_tab'),
_('seda_content_identification_tab'),
_('seda_content_date_tab'),
_('seda_content_gps_tab'),
......@@ -154,15 +155,6 @@ class AbstractContentPrimaryTab(tabs.PrimaryTab):
__select__ = tabs.PrimaryTab.__select__ & is_instance('SEDAContent')
class ContentDescriptionTab(tabs.PrimaryTab):
"""Display identification data about an archive unit content."""
__regid__ = 'seda_content_advanced_description_tab'
rtype_role_targets = [(rtype, role, None) for rtype, role in description_rtype_role]
rsection, display_ctrl = rtags_from_rtype_role_targets('SEDAContent', rtype_role_targets)
class ContentIdentificationTab(tabs.PrimaryTab):
"""Display identification data about an archive unit content."""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment