From eaf2d930620efcb478b8cda2e9787ae803b63ede Mon Sep 17 00:00:00 2001 From: Peter Weber Date: Thu, 13 Aug 2020 09:51:11 +0200 Subject: [PATCH] data: reorganisation of json schema. Reorganizes `numbering_script` from `common/languages-v0.0.1.json` to `documents/document_series-v0.0.1.json`. * closes #1147 Co-Authored-by: Peter Weber --- .../jsonschemas/common/languages-v0.0.1.json | 32 -------------- .../documents/document_series-v0.0.1.json | 42 ++++++++++++++++++- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/rero_ils/jsonschemas/common/languages-v0.0.1.json b/rero_ils/jsonschemas/common/languages-v0.0.1.json index befe21d19a..9a8b3797eb 100644 --- a/rero_ils/jsonschemas/common/languages-v0.0.1.json +++ b/rero_ils/jsonschemas/common/languages-v0.0.1.json @@ -2560,37 +2560,5 @@ "$ref": "#/language_script_code" } } - }, - "numbering_script": { - "title": "Values", - "type": "object", - "propertiesOrder": [ - "language", - "value" - ], - "required": [ - "value" - ], - "form": { - "templateOptions": { - "cssClass": "row" - } - }, - "properties": { - "value": { - "title": "Value", - "type": "string", - "minLength": 1, - "form": { - "placeholder": "Example: vol.3", - "templateOptions": { - "cssClass": "col-lg-6" - } - } - }, - "language": { - "$ref": "#/language_script_code" - } - } } } diff --git a/rero_ils/modules/documents/jsonschemas/documents/document_series-v0.0.1.json b/rero_ils/modules/documents/jsonschemas/documents/document_series-v0.0.1.json index 5b0a3b908c..9b865a3009 100644 --- a/rero_ils/modules/documents/jsonschemas/documents/document_series-v0.0.1.json +++ b/rero_ils/modules/documents/jsonschemas/documents/document_series-v0.0.1.json @@ -32,7 +32,9 @@ "minItems": 1, "items": { "title": "Numbering", - "$ref": "https://ils.rero.ch/schemas/common/languages-v0.0.1.json#/numbering_script" + "numbering_script": { + "$ref": "#/definitions/numbering_script" + } } }, "subseriesStatement": { @@ -66,7 +68,9 @@ "minItems": 1, "items": { "title": "Numbering", - "$ref": "https://ils.rero.ch/schemas/common/languages-v0.0.1.json#/numbering_script" + "numbering_script": { + "$ref": "#/definitions/numbering_script" + } } } } @@ -86,5 +90,39 @@ "cssClass": "editor-title" } } + }, + "definitions": { + "numbering_script": { + "title": "Values", + "type": "object", + "propertiesOrder": [ + "language", + "value" + ], + "required": [ + "value" + ], + "form": { + "templateOptions": { + "cssClass": "row" + } + }, + "properties": { + "value": { + "title": "Value", + "type": "string", + "minLength": 1, + "form": { + "placeholder": "Example: vol.3", + "templateOptions": { + "cssClass": "col-lg-6" + } + } + }, + "language": { + "$ref": "https://ils.rero.ch/schemas/common/languages-v0.0.1.json#/language_script_code" + } + } + } } }