Merge pull request #146 from syslabcom/scrum-1199-schema-field-order-2

Different approach to field ordering

Author: reinhardt

src/recensio/plone/behaviors/article.py

@@ -37,9 +37,6 @@ class IArticle(model.Schema):
         required=False,
     )
 
-    directives.order_after(
-        heading__page_number_of_article_in_journal_or_edited_volume="IArticle.translatedTitle"
-    )
     heading__page_number_of_article_in_journal_or_edited_volume = schema.TextLine(
         title=_(
             "description_page_number_of_article_in_journal_or_edited_volume",
@@ -54,15 +51,11 @@ class IArticle(model.Schema):
         heading__page_number_of_article_in_journal_or_edited_volume="display"
     )
 
-    directives.order_after(
-        pageStartOfArticle="IArticle.heading__page_number_of_article_in_journal_or_edited_volume"
-    )
     pageStartOfArticle = schema.Int(
         title=_("label_page_start_of_article_in_journal_or_edited_volume"),
         required=False,
     )
 
-    directives.order_after(pageEndOfArticle="IArticle.pageStartOfArticle")
     pageEndOfArticle = schema.Int(
         title=_("label_page_end_of_article_in_journal_or_edited_volume"),
         required=False,

src/recensio/plone/behaviors/authors.py

@@ -20,7 +20,6 @@ class IAuthors(model.Schema):
         RelatedItemsFieldWidget,
         pattern_options={"mode": "auto", "favorites": []},
     )
-    directives.order_after(authors="IEditorial.help_authors_or_editors")
     authors = RelationList(
         title=_("Authors"),
         defaultFactory=list,

src/recensio/plone/behaviors/base.py

@@ -81,14 +81,22 @@ class IBase(model.Schema):
         allowed_mime_types=["text/html"],
     )
 
-    directives.order_after(urn="IBase.canonical_uri")
+    directives.order_after(canonical_uri="IBaseReview.customCitation")
+    canonical_uri = schema.TextLine(
+        title=_("Original Source URL"),
+        description=_(
+            "description_uri",
+            default="Please fill in only after consultation with the recensio.net team",
+        ),
+        required=False,
+    )
+
     urn = schema.TextLine(
         title=_("URN"),
         description=_("description_urn", default="Filled in by the editorial staff"),
         required=False,
     )
 
-    directives.order_after(bv="IBase.urn")
     bv = schema.TextLine(
         title=_("BV Number"),
         description=_(
@@ -97,7 +105,6 @@ class IBase(model.Schema):
         required=False,
     )
 
-    directives.order_after(ppn="IBase.bv")
     ppn = schema.TextLine(
         title=_("PPN"),
         description=_(
@@ -106,19 +113,8 @@ class IBase(model.Schema):
         required=False,
     )
 
-    directives.order_after(canonical_uri="IBaseReview.customCitation")
-    canonical_uri = schema.TextLine(
-        title=_("Original Source URL"),
-        description=_(
-            "description_uri",
-            default="Please fill in only after consultation with the recensio.net team",
-        ),
-        required=False,
-    )
-
     # TODO
     # size=10,
-    directives.order_after(ddcSubject="ICoverPicture.coverPicture")
     ddcSubject = schema.List(
         title=_("ddc subject"),
         value_type=schema.Choice(vocabulary="recensio.plone.vocabularies.topic_values"),
@@ -128,7 +124,6 @@ class IBase(model.Schema):
 
     # TODO
     # size=10,
-    directives.order_after(ddcTime="IBase.ddcSubject")
     ddcTime = schema.List(
         title=_("ddc time"),
         value_type=schema.Choice(vocabulary="recensio.plone.vocabularies.epoch_values"),
@@ -138,7 +133,6 @@ class IBase(model.Schema):
 
     # TODO
     # size=10,
-    directives.order_after(ddcPlace="IBase.ddcTime")
     ddcPlace = schema.List(
         title=_("ddc place"),
         value_type=schema.Choice(

src/recensio/plone/behaviors/book_review.py

@@ -23,20 +23,6 @@ class IAdditionalTitleRowSchema(Interface):
 
 @provider(IFormFieldProvider)
 class IBookReview(model.Schema):
-    subtitle = schema.TextLine(
-        title=_("Subtitle"),
-        required=False,
-    )
-
-    additionalTitles = schema.List(
-        title=_("Paralleltitel (andere Sprachen)"),
-        value_type=DictRow(schema=IAdditionalTitleRowSchema, required=False),
-        required=False,
-        defaultFactory=list,
-    )
-    directives.widget(additionalTitles=DataGridFieldFactory)
-    textindexer.searchable("additionalTitles")
-
     isbn = schema.TextLine(
         title=_("ISBN"),
         description=_(
@@ -75,23 +61,33 @@ class IBookReview(model.Schema):
         title=_("DOI (Monographie)"),
         required=False,
     )
+
+    subtitle = schema.TextLine(
+        title=_("Subtitle"),
+        required=False,
+    )
+
+    additionalTitles = schema.List(
+        title=_("Paralleltitel (andere Sprachen)"),
+        value_type=DictRow(schema=IAdditionalTitleRowSchema, required=False),
+        required=False,
+        defaultFactory=list,
+    )
+    directives.widget(additionalTitles=DataGridFieldFactory)
+    textindexer.searchable("additionalTitles")
+
     # customizations
     directives.order_after(subtitle="ITextReview.title")
     directives.order_after(additionalTitles="IBookReview.subtitle")
-    directives.order_before(isbn="IBase.languageReviewedText")
-    directives.order_before(isbn_online="IBase.languageReviewedText")
-    directives.order_before(url_monograph="IBase.languageReviewedText")
-    directives.order_before(urn_monograph="IBase.languageReviewedText")
-    directives.order_before(doi_monograph="IBase.languageReviewedText")
     fieldset_reviewed_text(
         [
-            "subtitle",
-            "additionalTitles",
             "isbn",
             "isbn_online",
             "url_monograph",
             "urn_monograph",
             "doi_monograph",
+            "subtitle",
+            "additionalTitles",
         ],
     )
 

src/recensio/plone/behaviors/cover_picture.py

@@ -1,4 +1,3 @@
-from plone.autoform import directives
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.dexterity.interfaces import IDexterityContent
 from plone.namedfile.field import NamedBlobImage
@@ -16,7 +15,6 @@ class ICoverPicture(model.Schema):
         title=_("Cover picture"),
         required=False,
     )
-    directives.order_after(coverPicture="IPrintedReview.placeOfPublication")
     fieldset_reviewed_text(["coverPicture"])
 
 
@@ -26,7 +24,6 @@ class ICoverPictureEditedVolume(model.Schema):
         title=_("Cover picture"),
         required=False,
     )
-    directives.order_after(coverPicture="IPrintedReviewEditedVolume.publisherOnline")
     fieldset_edited_volume(["coverPicture"])
 
 

src/recensio/plone/behaviors/editorial.py

@@ -19,7 +19,7 @@
 
 @provider(IFormFieldProvider)
 class IEditorial(model.Schema):
-    directives.order_after(help_authors_or_editors="IBase.languageReviewedText")
+    directives.order_before(help_authors_or_editors="IAuthors.authors")
     help_authors_or_editors = schema.TextLine(
         title=_(
             "help_authors_or_editors",
@@ -58,22 +58,6 @@ class IEditorial(model.Schema):
 
 @provider(IFormFieldProvider)
 class IEditorialEditedVolume(model.Schema):
-    directives.order_after(help_authors_or_editors="IBase.languageReviewedText")
-    help_authors_or_editors = schema.TextLine(
-        title=_(
-            "help_authors_or_editors",
-            default=(
-                "Please fill in either authors OR editors "
-                "(exception: Complete Works etc.)"
-            ),
-        ),
-        required=False,
-    )
-    # This is just use to show a label in the form
-    # XXX It is probably better to use a custom widget with a schema.Field,
-    # but I have to think more about it
-    directives.mode(help_authors_or_editors="display")
-
     editorial = RelationList(
         title=_("label_editorial", default="Editor(s) of the presented monograph"),
         defaultFactory=list,
@@ -86,7 +70,6 @@ class IEditorialEditedVolume(model.Schema):
         pattern_options={"mode": "auto", "favorites": []},
     )
     # customizations
-    directives.omitted("help_authors_or_editors")
     fieldset_edited_volume(
         [
             "editorial",

src/recensio/plone/behaviors/journal_review.py

@@ -45,12 +45,17 @@ class IJournalReview(model.Schema):
         required=False,
     )
 
-    directives.order_after(shortnameJournal="IReviewJournal.translatedTitleJournal")
+    directives.order_after(shortnameJournal="translatedTitleJournal")
     shortnameJournal = schema.TextLine(
         title=_("Shortname"),
         required=False,
     )
 
+    officialYearOfPublication = schema.TextLine(
+        title=_("Official year of publication (if different)"),
+        required=False,
+    )
+
     volumeNumber = schema.TextLine(
         title=_("Vol."),
         required=False,
@@ -60,17 +65,9 @@ class IJournalReview(model.Schema):
         title=_("Number"),
         required=False,
     )
-
-    officialYearOfPublication = schema.TextLine(
-        title=_("Official year of publication (if different)"),
-        required=False,
-    )
     # customizations
-    directives.order_before(issn="IBase.languageReviewedText")
-    directives.order_before(issn_online="IBase.languageReviewedText")
-    directives.order_before(url_journal="IBase.languageReviewedText")
-    directives.order_before(urn_journal="IBase.languageReviewedText")
-    directives.order_before(doi_journal="IBase.languageReviewedText")
+    directives.order_after(issueNumber="IPrintedReview.yearOfPublication")
+    directives.order_after(volumeNumber="IPrintedReview.yearOfPublication")
     directives.order_after(officialYearOfPublication="IPrintedReview.yearOfPublication")
     fieldset_reviewed_text(
         [
@@ -122,7 +119,7 @@ class IJournalArticleReview(model.Schema):
         required=False,
     )
 
-    directives.order_after(shortnameJournal="IReviewJournal.translatedTitleJournal")
+    directives.order_after(shortnameJournal="translatedTitleJournal")
     shortnameJournal = schema.TextLine(
         title=_("Shortname"),
         required=False,

src/recensio/plone/behaviors/printed_review.py

@@ -57,15 +57,6 @@ class IPrintedReview(model.Schema):
         required=False,
     )
     directives.omitted("idBvb")
-    # customizations
-    directives.order_after(yearOfPublication="IJournalReview.shortnameJournal")
-    directives.order_after(placeOfPublication="IJournalReview.issueNumber")
-    directives.order_after(publisher="IPrintedReview.placeOfPublication")
-    directives.order_after(yearOfPublicationOnline="IPrintedReview.publisher")
-    directives.order_after(
-        placeOfPublicationOnline="IPrintedReview.yearOfPublicationOnline"
-    )
-    directives.order_after(publisherOnline="IPrintedReview.placeOfPublicationOnline")
     fieldset_reviewed_text(
         [
             # "heading_presented_work",
@@ -126,21 +117,6 @@ class IPrintedReviewEditedVolume(model.Schema):
         required=False,
     )
     directives.omitted("idBvb")
-    # customizations
-    directives.order_after(yearOfPublication="IJournalArticleReview.shortnameJournal")
-    directives.order_after(
-        placeOfPublication="IPrintedReviewEditedVolume.yearOfPublication"
-    )
-    directives.order_after(publisher="IPrintedReviewEditedVolume.placeOfPublication")
-    directives.order_after(
-        yearOfPublicationOnline="IPrintedReviewEditedVolume.publisher"
-    )
-    directives.order_after(
-        placeOfPublicationOnline="IPrintedReviewEditedVolume.yearOfPublicationOnline"
-    )
-    directives.order_after(
-        publisherOnline="IPrintedReviewEditedVolume.placeOfPublicationOnline"
-    )
     fieldset_edited_volume(
         [
             # "heading_presented_work",

src/recensio/plone/behaviors/serial.py

@@ -1,4 +1,3 @@
-from plone.autoform import directives
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.dexterity.interfaces import IDexterityContent
 from plone.supermodel import model
@@ -12,19 +11,16 @@
 
 @provider(IFormFieldProvider)
 class ISerial(model.Schema):
-    directives.order_after(series="IPrintedReview.publisherOnline")
     series = schema.TextLine(
         title=_("Series"),
         required=False,
     )
 
-    directives.order_after(seriesVol="ISerial.series")
     seriesVol = schema.TextLine(
         title=_("Series (vol.)"),
         required=False,
     )
 
-    directives.order_after(pages="ISerial.seriesVol")
     pages = schema.TextLine(
         title=_("Pages"),
         required=False,
@@ -35,19 +31,16 @@ class ISerial(model.Schema):
 
 @provider(IFormFieldProvider)
 class ISerialEditedVolume(model.Schema):
-    directives.order_after(series="IPrintedReview.publisherOnline")
     series = schema.TextLine(
         title=_("Series"),
         required=False,
     )
 
-    directives.order_after(seriesVol="ISerial.series")
     seriesVol = schema.TextLine(
         title=_("Series (vol.)"),
         required=False,
     )
 
-    directives.order_after(pages="ISerial.seriesVol")
     pages = schema.TextLine(
         title=_("Pages"),
         required=False,

src/recensio/plone/behaviors/text_review.py

@@ -13,11 +13,7 @@
 
 @provider(IFormFieldProvider)
 class ITextReview(model.Schema):
-    directives.order_after(title="IAuthors.authors")
-    title = schema.TextLine(title=_DX("label_title", default="Title"), required=True)
-
     directives.widget("languageReviewedText", SelectFieldWidget)
-    directives.order_before(languageReviewedText="IAuthors.authors")
     languageReviewedText = schema.List(
         title=_("Language(s) (text)"),
         value_type=schema.Choice(
@@ -26,6 +22,9 @@ class ITextReview(model.Schema):
         required=False,
         defaultFactory=list,
     )
+
+    title = schema.TextLine(title=_DX("label_title", default="Title"), required=True)
+
     fieldset_reviewed_text(
         [
             "languageReviewedText",