diff --git a/README.md b/README.md
index 9b9907f4c510a533c8c3c06eb432c123d9827f5a..6173d8b887407fa8e7d36644138fbe1fac0ee3e5 100644
--- a/README.md
+++ b/README.md
@@ -83,13 +83,8 @@ Note that this local server will only work inside Docker.
### User groups
-One group has a special meaning in Arkindex: The `Internal` group, for special users whose tokens are used by workers. This groups is configured using the `INTERNAL_GROUP_ID` setting. The development server will show warnings but let you start the server anyway if the group isn't there; you will be able to access the Django admin and create the group from there. To create them using the shell:
-
-```
-backend/arkindex$ ./manage.py shell
->>> from django.contrib.auth.models import Group
->>> Group.objects.create(id=2, name='Internal')
-```
+We use a custom group model in `arkindex.users.models` (not the `django.contrib.auth` one).
+In this early version groups do not define any right yet.
## Usage
diff --git a/arkindex/documents/fixtures/data.json b/arkindex/documents/fixtures/data.json
index 43e9debed534a5920a0c161adca0b0c8e538e6e2..5d3b2c8d4323f8be8d684d14d8fab650fdc4f265 100644
--- a/arkindex/documents/fixtures/data.json
+++ b/arkindex/documents/fixtures/data.json
@@ -1,115 +1,115 @@
[
{
"model": "dataimport.repository",
- "pk": "1e022c37-4a8e-4624-8fbe-6c8a4d5b22a2",
+ "pk": "5e396627-e235-40d5-b726-fe108be8fb1b",
"fields": {
- "url": "http://gitlab/repo",
- "type": "iiif",
- "hook_token": "hook-token",
- "credentials": "b07d0cb3-65b7-45c4-9bf2-d7153f4d27cd",
+ "url": "http://my_repo.fake/workers/worker",
+ "type": "worker",
+ "hook_token": "worker-hook-token",
+ "credentials": "5665e36b-ae6c-4830-84ab-c283e363c1c5",
"provider_name": "GitLabProvider"
}
},
{
"model": "dataimport.repository",
- "pk": "b6e463c3-0631-425f-8702-da7f32166b21",
+ "pk": "cdb5b204-1a2a-4cd2-be2f-18987a524946",
"fields": {
- "url": "http://my_repo.fake/workers/worker",
- "type": "worker",
- "hook_token": "worker-hook-token",
- "credentials": "b07d0cb3-65b7-45c4-9bf2-d7153f4d27cd",
+ "url": "http://gitlab/repo",
+ "type": "iiif",
+ "hook_token": "hook-token",
+ "credentials": "5665e36b-ae6c-4830-84ab-c283e363c1c5",
"provider_name": "GitLabProvider"
}
},
{
"model": "dataimport.revision",
- "pk": "bc9f203f-e870-4f79-96ce-4c0f3211691e",
+ "pk": "0f0342f5-de30-435e-82e1-ae49f8ba7531",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "repo": "b6e463c3-0631-425f-8702-da7f32166b21",
- "hash": "1337",
- "message": "My w0rk3r",
- "author": "Test user"
+ "repo": "cdb5b204-1a2a-4cd2-be2f-18987a524946",
+ "hash": "42",
+ "message": "a",
+ "author": "me"
}
},
{
"model": "dataimport.revision",
- "pk": "f353f467-9fb4-4f78-b962-03a8cd10cd85",
+ "pk": "8a3312dd-2bd3-4945-b698-18665e4067ee",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "repo": "1e022c37-4a8e-4624-8fbe-6c8a4d5b22a2",
- "hash": "42",
- "message": "a",
- "author": "me"
+ "repo": "5e396627-e235-40d5-b726-fe108be8fb1b",
+ "hash": "1337",
+ "message": "My w0rk3r",
+ "author": "Test user"
}
},
{
"model": "dataimport.worker",
- "pk": "72cd3c6b-be61-439e-ac00-da0440a6dfab",
+ "pk": "594c0947-bc77-4789-885f-d25c3f3002d6",
"fields": {
"name": "Recognizer",
"slug": "reco",
"type": "recognizer",
- "repository": "b6e463c3-0631-425f-8702-da7f32166b21"
+ "repository": "5e396627-e235-40d5-b726-fe108be8fb1b"
}
},
{
"model": "dataimport.worker",
- "pk": "dd3e3126-f07d-47d5-80cc-f9439aca0ad0",
+ "pk": "77a92b42-6ef7-4f64-a13f-91aa428c027f",
"fields": {
"name": "Document layout analyser",
"slug": "dla",
"type": "dla",
- "repository": "b6e463c3-0631-425f-8702-da7f32166b21"
+ "repository": "5e396627-e235-40d5-b726-fe108be8fb1b"
}
},
{
"model": "dataimport.workerversion",
- "pk": "060456c0-c109-4f05-b78d-4dbe13995d05",
+ "pk": "6d9e758b-fc18-4c14-b0bc-94a15163625e",
"fields": {
- "worker": "72cd3c6b-be61-439e-ac00-da0440a6dfab",
- "revision": "bc9f203f-e870-4f79-96ce-4c0f3211691e",
+ "worker": "594c0947-bc77-4789-885f-d25c3f3002d6",
+ "revision": "8a3312dd-2bd3-4945-b698-18665e4067ee",
"configuration": {
"test": 42
},
"state": "available",
- "docker_image": "2f4c9981-6ee0-43a1-80f0-54cca23be3ff",
+ "docker_image": "462af040-499c-4b7b-85d1-25d2d1b349e8",
"docker_image_iid": null
}
},
{
"model": "dataimport.workerversion",
- "pk": "67be8557-e683-43c5-b9d7-1b57b4516e09",
+ "pk": "b0aa5214-ac0f-48b8-800a-e8a66545e0fd",
"fields": {
- "worker": "dd3e3126-f07d-47d5-80cc-f9439aca0ad0",
- "revision": "bc9f203f-e870-4f79-96ce-4c0f3211691e",
+ "worker": "77a92b42-6ef7-4f64-a13f-91aa428c027f",
+ "revision": "8a3312dd-2bd3-4945-b698-18665e4067ee",
"configuration": {
"test": 42
},
"state": "available",
- "docker_image": "2f4c9981-6ee0-43a1-80f0-54cca23be3ff",
+ "docker_image": "462af040-499c-4b7b-85d1-25d2d1b349e8",
"docker_image_iid": null
}
},
{
"model": "documents.corpus",
- "pk": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
+ "pk": "0549780c-bce1-445e-8f07-7e32889fe71e",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"name": "Unit Tests",
"description": "",
- "repository": "1e022c37-4a8e-4624-8fbe-6c8a4d5b22a2",
+ "repository": "cdb5b204-1a2a-4cd2-be2f-18987a524946",
"public": true
}
},
{
"model": "documents.elementtype",
- "pk": "1e98cd23-9b0b-44ed-84b5-3a9e4dec68b3",
+ "pk": "3536ef92-ad56-4b63-b243-d71afc4fdded",
"fields": {
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
"slug": "volume",
"display_name": "Volume",
"folder": true,
@@ -118,9 +118,9 @@
},
{
"model": "documents.elementtype",
- "pk": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
+ "pk": "419898d9-287c-48fb-9fce-22dc237bec14",
"fields": {
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
"slug": "word",
"display_name": "Word",
"folder": false,
@@ -129,9 +129,9 @@
},
{
"model": "documents.elementtype",
- "pk": "6bc2cbbd-b98e-4689-bf9d-8a9095710632",
+ "pk": "433202e9-f8c1-4f76-9b65-7fff323798b2",
"fields": {
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
"slug": "act",
"display_name": "Act",
"folder": false,
@@ -140,9 +140,9 @@
},
{
"model": "documents.elementtype",
- "pk": "77739a6b-f044-4a5e-9c19-bc881caafbbf",
+ "pk": "611f5a3e-1137-4984-b27c-a07d3c7ff728",
"fields": {
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
"slug": "text_line",
"display_name": "Line",
"folder": false,
@@ -151,9 +151,9 @@
},
{
"model": "documents.elementtype",
- "pk": "8ccc9061-0bc7-4d74-8a83-d427273a8c56",
+ "pk": "68ac563f-b627-4f16-b941-f3a136a0ed26",
"fields": {
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
"slug": "page",
"display_name": "Page",
"folder": false,
@@ -162,9 +162,9 @@
},
{
"model": "documents.elementtype",
- "pk": "f56fb6dd-afe4-49b3-a870-963467404935",
+ "pk": "bff5642d-b6a9-4856-bc8f-1c01cb58c0b0",
"fields": {
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
"slug": "surface",
"display_name": "Surface",
"folder": false,
@@ -173,508 +173,508 @@
},
{
"model": "documents.elementpath",
- "pk": "06d9848e-c2cd-4f1b-9d07-00ed04f69b9e",
+ "pk": "1010dfe8-1285-44d7-9c2e-f1e5f212b218",
"fields": {
- "element": "bbd63fcc-23af-4593-bcb5-341c3008b7ab",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"35fb048c-f441-4e9d-bb69-78a8dfdb4598\"]",
- "ordering": 2
+ "element": "19dfd0e1-1517-4674-8d28-0b0d402afce6",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\"]",
+ "ordering": 4
}
},
{
"model": "documents.elementpath",
- "pk": "07d8a649-9b5c-4338-9e42-20a3fc9c884e",
+ "pk": "1a10ea74-7d77-497f-8ecb-7cfb71711a8d",
"fields": {
- "element": "35fb048c-f441-4e9d-bb69-78a8dfdb4598",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\"]",
+ "element": "550014fa-b5b4-46ee-b70d-7c00bb913ac7",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\"]",
"ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "0abd85c5-7d97-49ca-9b60-b67e7e7d215e",
+ "pk": "1f1affd5-6ea3-4200-9b17-cdbce7ea367d",
"fields": {
- "element": "7945d738-4a6e-4a76-ad57-21c03d63625d",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\"]",
- "ordering": 2
+ "element": "ed7a03cb-199f-4b54-b659-9567703cd361",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"ad7283c3-6643-49e2-a966-2e5c55cf4638\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "1aefc8c1-1dba-4f8e-b2eb-b7b7c5bc0b01",
+ "pk": "235ba787-53d5-460a-94ec-6de1db578d4b",
"fields": {
- "element": "7e788454-afed-4bef-a370-bccf0dd3b2b4",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\"]",
+ "element": "c0007432-82e1-4420-8075-173af982ba6f",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"4ad6a90c-f4ba-48e5-91ce-14d3bd3c6ba3\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "1f1a82a0-7835-465b-ae6d-d6db65e92696",
+ "pk": "29424414-5fbf-480e-b61b-1e2a109f8bf2",
"fields": {
- "element": "ebdb0c60-e1e4-4f8a-a8b7-4127896ac194",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\"]",
- "ordering": 1
+ "element": "69a25981-0e8e-4cf3-93a0-9a5c17030f4f",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"e6b3aed3-c443-4df2-98c2-f7da41eaceec\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "2f8c2139-9b01-415c-8a80-b708a7fd841d",
+ "pk": "2faf7133-54c1-46fd-b4f0-3498984d4a1a",
"fields": {
- "element": "326843be-0112-4954-a2ea-da78aded01a9",
- "path": "[\"07422db5-10c5-404b-9325-db2689871761\"]",
- "ordering": 0
+ "element": "c7295c75-b855-4b70-9475-a00e7ef9a572",
+ "path": "[\"3df1ce74-6f2d-473d-bd0d-b20bf6b913ef\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "4beb2166-9bc1-462f-bbbb-34cb43ceeb8a",
+ "pk": "31640292-df9c-4101-b4c0-1179e6152a4d",
"fields": {
- "element": "b9f39256-6ff0-4daf-b56a-a5a316964133",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"35fb048c-f441-4e9d-bb69-78a8dfdb4598\"]",
+ "element": "9433969b-792e-44bf-93ad-db17c6bcd3de",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"19dfd0e1-1517-4674-8d28-0b0d402afce6\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "4e98abb3-e74c-4532-a831-11b41c00f2d5",
+ "pk": "4a36de70-76b4-4671-819f-39f7a881a661",
"fields": {
- "element": "96893993-5b8d-4ed0-b305-08f745d8df01",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"35fb048c-f441-4e9d-bb69-78a8dfdb4598\"]",
- "ordering": 1
+ "element": "28ce8c14-2514-4fd5-bd6f-bd7fb668e36a",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"bee8c02b-98f6-4185-9897-762b62f73b3b\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "4ed309a6-3af4-4fe4-975d-0a25ecd48bcf",
+ "pk": "5275e23b-de55-4fc4-8d5f-b3a07d803aa4",
"fields": {
- "element": "c4ccff42-93d3-4f66-a073-397dd85e1806",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\"]",
- "ordering": 4
+ "element": "816b5708-411d-4763-b03b-66ef5a3531d6",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"84013d64-a85b-47c7-b734-722de1ae0d4b\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "5980b951-7bcc-4213-a73b-e71659e8a8e1",
+ "pk": "60a579da-f473-4519-ac0a-4ca681be33d5",
"fields": {
- "element": "5130da8e-f2aa-477d-bf58-a2357efc8b2b",
- "path": "[\"07422db5-10c5-404b-9325-db2689871761\"]",
- "ordering": 2
+ "element": "de4cd51c-3f98-4b97-92c7-fd8b7c15feea",
+ "path": "[\"3df1ce74-6f2d-473d-bd0d-b20bf6b913ef\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "7680a018-4523-4abc-8242-132958dd7f5a",
+ "pk": "6176fe99-ca33-4fa3-aaa9-2af038475466",
"fields": {
- "element": "fcf303df-36a5-40f2-997f-82eb47541bcf",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"99de88f1-9655-4bae-9203-01d56d097ef7\"]",
- "ordering": 1
+ "element": "bee8c02b-98f6-4185-9897-762b62f73b3b",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "7de05621-65f2-4dcb-8f44-9a88fdfb3a22",
+ "pk": "6a8148b3-f9d3-4179-bd61-4e368c7afdb5",
"fields": {
- "element": "cbafeb68-d66a-4e1c-bcd4-47dd88b02eec",
- "path": "[\"07422db5-10c5-404b-9325-db2689871761\"]",
- "ordering": 1
+ "element": "4721e07a-2d53-4066-85a5-1c3a99e0840a",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"4ad6a90c-f4ba-48e5-91ce-14d3bd3c6ba3\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "a3e6f951-64da-474b-bd61-d323ad71d5c9",
+ "pk": "76ee2d3a-7509-4cb4-ad96-ed4ea18a174e",
"fields": {
- "element": "9f81a475-ed1f-470d-b11a-9740d6bb24d2",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"99de88f1-9655-4bae-9203-01d56d097ef7\"]",
+ "element": "ef787c30-b839-43f3-8a5e-cc87498cffd1",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"facee923-af23-4d71-8882-b20d621a66fd\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "a7ad8b75-e9fd-44f9-acec-a283b90d9585",
+ "pk": "814eb8ab-4cef-4fd0-8fe7-8265529bc5c7",
"fields": {
- "element": "73b56c40-4136-499b-9c10-82c2f569c78b",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"99de88f1-9655-4bae-9203-01d56d097ef7\"]",
- "ordering": 0
+ "element": "c143d67e-aed5-4404-aa76-f47605dbf919",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"550014fa-b5b4-46ee-b70d-7c00bb913ac7\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "a9aec95c-fa0f-4b0d-b3ab-7e061481b7bb",
+ "pk": "8313a9af-2c02-42c8-869e-d9de2ccaa420",
"fields": {
- "element": "1fcb137d-12aa-47ea-8d94-fffd821cc3da",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"b675ba10-f6ed-45cb-8a8c-449940471db5\"]",
- "ordering": 0
+ "element": "f7921f4f-be7b-4e41-9c27-37447d9f622c",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"550014fa-b5b4-46ee-b70d-7c00bb913ac7\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "aa5478d1-be7c-48c2-90cf-ae0294981ad9",
+ "pk": "92d7e7aa-b8a9-47c5-a85f-2fe4afff5eb2",
"fields": {
- "element": "4d5191a9-5161-4587-a6bf-6430786f869a",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"99de88f1-9655-4bae-9203-01d56d097ef7\"]",
- "ordering": 2
+ "element": "2ea41a99-a805-4364-966d-60761d28dcb4",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"84013d64-a85b-47c7-b734-722de1ae0d4b\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "ae105ab9-b082-44e3-8dd9-eb14c65f83a1",
+ "pk": "9c737671-d173-4667-bf84-4d791c0e84d2",
"fields": {
- "element": "cb1b2af4-9cd8-4ecb-99a3-a7f309198a7b",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"7e788454-afed-4bef-a370-bccf0dd3b2b4\"]",
- "ordering": 0
+ "element": "0e7121f8-efdd-4ef8-b5a7-ca5b4457e83c",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"e6b3aed3-c443-4df2-98c2-f7da41eaceec\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "b5b1d6ea-c2ee-4c91-8f90-be745e05559d",
+ "pk": "9fce56f4-7f1a-4740-9eb7-e2875e5ca4a2",
"fields": {
- "element": "9644857d-6c33-4241-ad43-38054fba11a0",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"ebdb0c60-e1e4-4f8a-a8b7-4127896ac194\"]",
+ "element": "1477b9c2-dedf-4d44-b4bd-b1162cf8a998",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"4ad6a90c-f4ba-48e5-91ce-14d3bd3c6ba3\"]",
"ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "b5c3893e-2127-4a09-9325-8545962f325c",
+ "pk": "a1448951-4d6f-4c6a-b34c-682deee5849f",
"fields": {
- "element": "ce358ae1-5d50-476e-b3bb-2f5abb3a9ce9",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"ebdb0c60-e1e4-4f8a-a8b7-4127896ac194\"]",
- "ordering": 0
+ "element": "4ad6a90c-f4ba-48e5-91ce-14d3bd3c6ba3",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "c048eef3-0e7b-4f6a-836c-bd0cae40b509",
+ "pk": "d0013169-fb83-437a-b77f-220cfc541b15",
"fields": {
- "element": "72f64b68-afc4-41e0-8020-e590bdaa9f7c",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"7945d738-4a6e-4a76-ad57-21c03d63625d\"]",
- "ordering": 1
+ "element": "e6b3aed3-c443-4df2-98c2-f7da41eaceec",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "d203709c-b528-4aa6-be17-56795c1d03fb",
+ "pk": "d267f759-8b50-41ff-9878-b266d1883570",
"fields": {
- "element": "5f20bff4-aa8b-4afa-ad96-e791c2433dc1",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"7945d738-4a6e-4a76-ad57-21c03d63625d\"]",
- "ordering": 2
+ "element": "facee923-af23-4d71-8882-b20d621a66fd",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "dff4ed00-697a-4e42-aff3-5d09f8f7785e",
+ "pk": "e965bc59-8a71-46e9-9a99-bacc9376d94a",
"fields": {
- "element": "99de88f1-9655-4bae-9203-01d56d097ef7",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\"]",
+ "element": "71c62984-5fec-4f8c-b821-8cd8c1349a72",
+ "path": "[\"3df1ce74-6f2d-473d-bd0d-b20bf6b913ef\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "e456aee3-8cf4-45e3-83f4-b64e61733b9c",
+ "pk": "edd68d22-aa3c-4ed0-b605-e6ae63aa8432",
"fields": {
- "element": "3442efb5-4960-432e-b6f9-795a415186d8",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"c4ccff42-93d3-4f66-a073-397dd85e1806\"]",
- "ordering": 0
+ "element": "84013d64-a85b-47c7-b734-722de1ae0d4b",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "f35b7715-2102-4827-9589-57c1b68405b9",
+ "pk": "f116e2b6-e1b4-4afa-901e-c040e2e58595",
"fields": {
- "element": "a493ea73-d17d-4f63-b6c9-1ebe04f36641",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"c53fc91f-58c7-4fda-a92c-72a5f4051176\"]",
+ "element": "de16de7e-79a5-42a7-94de-6a61d04ee721",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"e6b3aed3-c443-4df2-98c2-f7da41eaceec\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "f4affadd-0195-41da-80c5-d36e0a6b064c",
+ "pk": "f43a5721-6c09-428c-93dc-93ec49d0ff9c",
"fields": {
- "element": "775da282-9bef-4dcd-b1fa-0a7ff555cb9d",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\", \"7945d738-4a6e-4a76-ad57-21c03d63625d\"]",
+ "element": "69b51bc9-1d7d-4c9d-9289-9fb837892cad",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"550014fa-b5b4-46ee-b70d-7c00bb913ac7\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "f95a476b-a0b2-484d-ae3f-b720095c3f37",
+ "pk": "f5053c64-2472-4edc-88b1-b0b9aff45939",
"fields": {
- "element": "b675ba10-f6ed-45cb-8a8c-449940471db5",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\"]",
- "ordering": 3
+ "element": "506f4447-6bdc-4d29-9bd8-f82976116c0e",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\", \"e6b3aed3-c443-4df2-98c2-f7da41eaceec\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "fc030c8c-7dce-477f-913b-520a3ae6e545",
+ "pk": "faf93d73-34c0-4faa-be3c-9755076033cf",
"fields": {
- "element": "c53fc91f-58c7-4fda-a92c-72a5f4051176",
- "path": "[\"e001d1ee-fa90-4f96-b722-e2ba20b84097\"]",
- "ordering": 2
+ "element": "ad7283c3-6643-49e2-a966-2e5c55cf4638",
+ "path": "[\"afe50fbe-eb97-4366-8e18-1713aa711f4a\"]",
+ "ordering": 3
}
},
{
"model": "documents.element",
- "pk": "07422db5-10c5-404b-9325-db2689871761",
+ "pk": "0e7121f8-efdd-4ef8-b5a7-ca5b4457e83c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "1e98cd23-9b0b-44ed-84b5-3a9e4dec68b3",
- "name": "Volume 2",
- "zone": null,
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "419898d9-287c-48fb-9fce-22dc237bec14",
+ "name": "ROY",
+ "zone": "0ce0b1e6-e1a2-45f4-93f1-f9986fd4eb2e",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "1fcb137d-12aa-47ea-8d94-fffd821cc3da",
+ "pk": "1477b9c2-dedf-4d44-b4bd-b1162cf8a998",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "f56fb6dd-afe4-49b3-a870-963467404935",
- "name": "Surface E",
- "zone": "440f85ff-25d9-4488-8654-98c5916df96f",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "419898d9-287c-48fb-9fce-22dc237bec14",
+ "name": "ROY",
+ "zone": "8ef76685-65b7-435b-b6eb-c80ca6d8710a",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "326843be-0112-4954-a2ea-da78aded01a9",
+ "pk": "19dfd0e1-1517-4674-8d28-0b0d402afce6",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "8ccc9061-0bc7-4d74-8a83-d427273a8c56",
- "name": "Volume 2, page 1r",
- "zone": "aefbd01b-3421-458f-a8e6-2b5ffdaccc31",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "433202e9-f8c1-4f76-9b65-7fff323798b2",
+ "name": "Act 5",
+ "zone": null,
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "3442efb5-4960-432e-b6f9-795a415186d8",
+ "pk": "28ce8c14-2514-4fd5-bd6f-bd7fb668e36a",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "f56fb6dd-afe4-49b3-a870-963467404935",
- "name": "Surface F",
- "zone": "b70d7b27-c973-44ba-93c5-602957ae491e",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "bff5642d-b6a9-4856-bc8f-1c01cb58c0b0",
+ "name": "Surface D",
+ "zone": "41e685c0-9a8d-4802-8f72-d56bdb03c879",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "35fb048c-f441-4e9d-bb69-78a8dfdb4598",
+ "pk": "2ea41a99-a805-4364-966d-60761d28dcb4",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "8ccc9061-0bc7-4d74-8a83-d427273a8c56",
- "name": "Volume 1, page 1v",
- "zone": "0fb66d83-3d13-4d4e-82d1-1fd7fc82036f",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "bff5642d-b6a9-4856-bc8f-1c01cb58c0b0",
+ "name": "Surface B",
+ "zone": "dd1e7d88-a7bd-4444-8643-b99360267c42",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "4d5191a9-5161-4587-a6bf-6430786f869a",
+ "pk": "3df1ce74-6f2d-473d-bd0d-b20bf6b913ef",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
- "name": "DATUM",
- "zone": "40edd01e-02e6-4fbf-b2c6-b7452a72c79e",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "3536ef92-ad56-4b63-b243-d71afc4fdded",
+ "name": "Volume 2",
+ "zone": null,
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "5130da8e-f2aa-477d-bf58-a2357efc8b2b",
+ "pk": "4721e07a-2d53-4066-85a5-1c3a99e0840a",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "8ccc9061-0bc7-4d74-8a83-d427273a8c56",
- "name": "Volume 2, page 2r",
- "zone": "11bb6bba-8a2e-4f9e-97b1-0f48bc34103f",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "419898d9-287c-48fb-9fce-22dc237bec14",
+ "name": "DATUM",
+ "zone": "ecd9f9aa-ce91-4969-99a7-63e9dcbd8ca6",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "5f20bff4-aa8b-4afa-ad96-e791c2433dc1",
+ "pk": "4ad6a90c-f4ba-48e5-91ce-14d3bd3c6ba3",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
- "name": "DATUM",
- "zone": "7e767702-f644-451f-91e8-05423bb8e074",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "68ac563f-b627-4f16-b941-f3a136a0ed26",
+ "name": "Volume 1, page 2r",
+ "zone": "60978133-f6ad-4620-b8dc-f52053d30b97",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "72f64b68-afc4-41e0-8020-e590bdaa9f7c",
+ "pk": "506f4447-6bdc-4d29-9bd8-f82976116c0e",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
- "name": "ROY",
- "zone": "0039b5f5-078f-4667-825c-6e620b92b59a",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "611f5a3e-1137-4984-b27c-a07d3c7ff728",
+ "name": "Text line",
+ "zone": "0ce0b1e6-e1a2-45f4-93f1-f9986fd4eb2e",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "73b56c40-4136-499b-9c10-82c2f569c78b",
+ "pk": "550014fa-b5b4-46ee-b70d-7c00bb913ac7",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
- "name": "PARIS",
- "zone": "72e1be99-f517-48c4-b45a-808dea668ec0",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "68ac563f-b627-4f16-b941-f3a136a0ed26",
+ "name": "Volume 1, page 1v",
+ "zone": "1b7f99d7-4311-4b5a-a4e5-80e7d64f5597",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "775da282-9bef-4dcd-b1fa-0a7ff555cb9d",
+ "pk": "69a25981-0e8e-4cf3-93a0-9a5c17030f4f",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
- "name": "PARIS",
- "zone": "272f32c2-29eb-47e7-b244-b0a6c2a772c0",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "419898d9-287c-48fb-9fce-22dc237bec14",
+ "name": "DATUM",
+ "zone": "e93d0bc9-bdd7-442f-aeee-e2454c6cf833",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "7945d738-4a6e-4a76-ad57-21c03d63625d",
+ "pk": "69b51bc9-1d7d-4c9d-9289-9fb837892cad",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "8ccc9061-0bc7-4d74-8a83-d427273a8c56",
- "name": "Volume 1, page 2r",
- "zone": "6a85fb05-f7d1-498d-b93c-62739562c3e3",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "419898d9-287c-48fb-9fce-22dc237bec14",
+ "name": "PARIS",
+ "zone": "e2fc38e5-f313-4b51-a364-3705a3875dfe",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "7e788454-afed-4bef-a370-bccf0dd3b2b4",
+ "pk": "71c62984-5fec-4f8c-b821-8cd8c1349a72",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6bc2cbbd-b98e-4689-bf9d-8a9095710632",
- "name": "Act 1",
- "zone": null,
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "68ac563f-b627-4f16-b941-f3a136a0ed26",
+ "name": "Volume 2, page 1r",
+ "zone": "ac959187-0ff5-4c87-ae5b-ee47f1656b96",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "9644857d-6c33-4241-ad43-38054fba11a0",
+ "pk": "816b5708-411d-4763-b03b-66ef5a3531d6",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "f56fb6dd-afe4-49b3-a870-963467404935",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "bff5642d-b6a9-4856-bc8f-1c01cb58c0b0",
"name": "Surface C",
- "zone": "0fb66d83-3d13-4d4e-82d1-1fd7fc82036f",
+ "zone": "1b7f99d7-4311-4b5a-a4e5-80e7d64f5597",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "96893993-5b8d-4ed0-b305-08f745d8df01",
+ "pk": "84013d64-a85b-47c7-b734-722de1ae0d4b",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
- "name": "ROY",
- "zone": "db138d8c-b5fc-46e6-8dc6-483a1ffc8bf6",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "433202e9-f8c1-4f76-9b65-7fff323798b2",
+ "name": "Act 2",
+ "zone": null,
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "99de88f1-9655-4bae-9203-01d56d097ef7",
+ "pk": "9433969b-792e-44bf-93ad-db17c6bcd3de",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "8ccc9061-0bc7-4d74-8a83-d427273a8c56",
- "name": "Volume 1, page 1r",
- "zone": "fb6dff0f-e117-48f0-b27a-9fa65f42a055",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "bff5642d-b6a9-4856-bc8f-1c01cb58c0b0",
+ "name": "Surface F",
+ "zone": "a26f7e91-a516-4598-a6d2-d43286fcf6b7",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "9f81a475-ed1f-470d-b11a-9740d6bb24d2",
+ "pk": "ad7283c3-6643-49e2-a966-2e5c55cf4638",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "77739a6b-f044-4a5e-9c19-bc881caafbbf",
- "name": "Text line",
- "zone": "f96e2027-4568-4527-a469-bcf27f4fcbb2",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "433202e9-f8c1-4f76-9b65-7fff323798b2",
+ "name": "Act 4",
+ "zone": null,
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "a493ea73-d17d-4f63-b6c9-1ebe04f36641",
+ "pk": "afe50fbe-eb97-4366-8e18-1713aa711f4a",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "f56fb6dd-afe4-49b3-a870-963467404935",
- "name": "Surface D",
- "zone": "a236763a-6d34-4c41-a1e5-a5e19d115d50",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "3536ef92-ad56-4b63-b243-d71afc4fdded",
+ "name": "Volume 1",
+ "zone": null,
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "b675ba10-f6ed-45cb-8a8c-449940471db5",
+ "pk": "bee8c02b-98f6-4185-9897-762b62f73b3b",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6bc2cbbd-b98e-4689-bf9d-8a9095710632",
- "name": "Act 4",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "433202e9-f8c1-4f76-9b65-7fff323798b2",
+ "name": "Act 3",
"zone": null,
"source": null,
"worker_version": null
@@ -682,147 +682,147 @@
},
{
"model": "documents.element",
- "pk": "b9f39256-6ff0-4daf-b56a-a5a316964133",
+ "pk": "c0007432-82e1-4420-8075-173af982ba6f",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "419898d9-287c-48fb-9fce-22dc237bec14",
"name": "PARIS",
- "zone": "c12fb064-b0df-4d8a-af13-55b2e9862e8d",
+ "zone": "7430649a-eeb2-4e9b-9639-5a773b2f24bd",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "bbd63fcc-23af-4593-bcb5-341c3008b7ab",
+ "pk": "c143d67e-aed5-4404-aa76-f47605dbf919",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "419898d9-287c-48fb-9fce-22dc237bec14",
"name": "DATUM",
- "zone": "bea07b51-a5bd-400a-b5d0-b0320dc77bd1",
+ "zone": "2bef6a9f-4bb6-4464-aa32-1bbcfd30e22f",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "c4ccff42-93d3-4f66-a073-397dd85e1806",
+ "pk": "c7295c75-b855-4b70-9475-a00e7ef9a572",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6bc2cbbd-b98e-4689-bf9d-8a9095710632",
- "name": "Act 5",
- "zone": null,
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "68ac563f-b627-4f16-b941-f3a136a0ed26",
+ "name": "Volume 2, page 2r",
+ "zone": "5c419725-0a23-4bed-8b79-160187ea9ef0",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "c53fc91f-58c7-4fda-a92c-72a5f4051176",
+ "pk": "de16de7e-79a5-42a7-94de-6a61d04ee721",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6bc2cbbd-b98e-4689-bf9d-8a9095710632",
- "name": "Act 3",
- "zone": null,
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "419898d9-287c-48fb-9fce-22dc237bec14",
+ "name": "PARIS",
+ "zone": "4d7d6a74-5061-4636-ae02-eae61177f089",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "cb1b2af4-9cd8-4ecb-99a3-a7f309198a7b",
+ "pk": "de4cd51c-3f98-4b97-92c7-fd8b7c15feea",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "f56fb6dd-afe4-49b3-a870-963467404935",
- "name": "Surface A",
- "zone": "9bae7b8e-b03b-40cf-a0d8-80393d76a304",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "68ac563f-b627-4f16-b941-f3a136a0ed26",
+ "name": "Volume 2, page 1v",
+ "zone": "168d6610-a232-4f89-8ea7-9d26068e4845",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "cbafeb68-d66a-4e1c-bcd4-47dd88b02eec",
+ "pk": "e6b3aed3-c443-4df2-98c2-f7da41eaceec",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "8ccc9061-0bc7-4d74-8a83-d427273a8c56",
- "name": "Volume 2, page 1v",
- "zone": "34f21948-295f-48a6-9644-41af328fdce4",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "68ac563f-b627-4f16-b941-f3a136a0ed26",
+ "name": "Volume 1, page 1r",
+ "zone": "008f25e7-0068-40cd-a083-3292102b6242",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "ce358ae1-5d50-476e-b3bb-2f5abb3a9ce9",
+ "pk": "ed7a03cb-199f-4b54-b659-9567703cd361",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "f56fb6dd-afe4-49b3-a870-963467404935",
- "name": "Surface B",
- "zone": "28c84829-8312-4f41-81e5-fa00fad02718",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "bff5642d-b6a9-4856-bc8f-1c01cb58c0b0",
+ "name": "Surface E",
+ "zone": "1eb1ca30-1799-4b77-b3e6-51effb20f969",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "e001d1ee-fa90-4f96-b722-e2ba20b84097",
+ "pk": "ef787c30-b839-43f3-8a5e-cc87498cffd1",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "1e98cd23-9b0b-44ed-84b5-3a9e4dec68b3",
- "name": "Volume 1",
- "zone": null,
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "bff5642d-b6a9-4856-bc8f-1c01cb58c0b0",
+ "name": "Surface A",
+ "zone": "b6c3f8c5-5b3d-4c6c-8e2c-6a4383bc0349",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "ebdb0c60-e1e4-4f8a-a8b7-4127896ac194",
+ "pk": "f7921f4f-be7b-4e41-9c27-37447d9f622c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6bc2cbbd-b98e-4689-bf9d-8a9095710632",
- "name": "Act 2",
- "zone": null,
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "419898d9-287c-48fb-9fce-22dc237bec14",
+ "name": "ROY",
+ "zone": "3df5119c-08a6-4efe-8a1d-de7143beb38b",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "fcf303df-36a5-40f2-997f-82eb47541bcf",
+ "pk": "facee923-af23-4d71-8882-b20d621a66fd",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "6acab4ca-a475-485e-b9cf-fc8a8404bcd1",
- "name": "ROY",
- "zone": "f96e2027-4568-4527-a469-bcf27f4fcbb2",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "433202e9-f8c1-4f76-9b65-7fff323798b2",
+ "name": "Act 1",
+ "zone": null,
"source": null,
"worker_version": null
}
},
{
"model": "documents.datasource",
- "pk": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "pk": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"fields": {
"type": "recognizer",
"slug": "test",
@@ -833,7 +833,7 @@
},
{
"model": "documents.datasource",
- "pk": "def9eadf-7b67-4f82-be03-5175ae644424",
+ "pk": "9ca9a82b-972d-44e2-8413-c8192e6f2bda",
"fields": {
"type": "classifier",
"slug": "test",
@@ -844,11 +844,11 @@
},
{
"model": "documents.transcription",
- "pk": "05f120a9-1c8a-4344-bf09-ef258cc04eca",
+ "pk": "0415d930-ce5d-4cef-b088-f69258ba0bf5",
"fields": {
- "element": "775da282-9bef-4dcd-b1fa-0a7ff555cb9d",
+ "element": "69b51bc9-1d7d-4c9d-9289-9fb837892cad",
"type": "word",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
"text": "PARIS",
"score": 1.0
@@ -856,23 +856,23 @@
},
{
"model": "documents.transcription",
- "pk": "094d1e1b-d35d-4e86-a2fd-4fabd60ba5fa",
+ "pk": "0aa4f0ca-81b8-4918-9acd-14390b203e56",
"fields": {
- "element": "fcf303df-36a5-40f2-997f-82eb47541bcf",
+ "element": "4721e07a-2d53-4066-85a5-1c3a99e0840a",
"type": "word",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
- "text": "ROY",
+ "text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "0c7b5b2d-d1f6-494c-8ba4-169cdf255f5e",
+ "pk": "7a5a1f9b-d1e8-4504-8b77-db0d181b281f",
"fields": {
- "element": "4d5191a9-5161-4587-a6bf-6430786f869a",
+ "element": "c143d67e-aed5-4404-aa76-f47605dbf919",
"type": "word",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
"text": "DATUM",
"score": 1.0
@@ -880,59 +880,59 @@
},
{
"model": "documents.transcription",
- "pk": "6c517add-09a0-41e4-bb03-0aea9ce1e628",
+ "pk": "7eb70406-eeb6-4a29-8d20-36a01e07490e",
"fields": {
- "element": "73b56c40-4136-499b-9c10-82c2f569c78b",
+ "element": "69a25981-0e8e-4cf3-93a0-9a5c17030f4f",
"type": "word",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
- "text": "PARIS",
+ "text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "802856d1-13a8-4d63-9af6-b0c8db086a89",
+ "pk": "82af4779-b66a-45a9-bc1d-bd42dfc22492",
"fields": {
- "element": "99de88f1-9655-4bae-9203-01d56d097ef7",
- "type": "page",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "element": "1477b9c2-dedf-4d44-b4bd-b1162cf8a998",
+ "type": "word",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
- "text": "Lorem ipsum dolor sit amet",
+ "text": "ROY",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "ab32afab-5d69-47d1-80f4-3ab1151462ef",
+ "pk": "89209b02-bddd-4b84-828e-9ca5c1572f9e",
"fields": {
- "element": "5f20bff4-aa8b-4afa-ad96-e791c2433dc1",
+ "element": "0e7121f8-efdd-4ef8-b5a7-ca5b4457e83c",
"type": "word",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
- "text": "DATUM",
+ "text": "ROY",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "d5cc8936-0a81-4b01-83d8-1dd75b0d60c0",
+ "pk": "af40fcc2-27cc-44ba-9f50-6d9b0e151642",
"fields": {
- "element": "bbd63fcc-23af-4593-bcb5-341c3008b7ab",
+ "element": "de16de7e-79a5-42a7-94de-6a61d04ee721",
"type": "word",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
- "text": "DATUM",
+ "text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "d7789e57-9fae-4465-9ef3-2f552a3d1e86",
+ "pk": "b191a67c-dfbf-4bcd-9ad5-800cd513e60b",
"fields": {
- "element": "72f64b68-afc4-41e0-8020-e590bdaa9f7c",
+ "element": "f7921f4f-be7b-4e41-9c27-37447d9f622c",
"type": "word",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
"text": "ROY",
"score": 1.0
@@ -940,63 +940,63 @@
},
{
"model": "documents.transcription",
- "pk": "dcd5a2be-5f89-4565-8acc-521c08672c65",
+ "pk": "cdfd4d6b-ea3e-40d5-8c86-2d89a1319ce6",
"fields": {
- "element": "96893993-5b8d-4ed0-b305-08f745d8df01",
+ "element": "c0007432-82e1-4420-8075-173af982ba6f",
"type": "word",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
- "text": "ROY",
+ "text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "f97dc9b7-15d5-4b3c-ac3e-621604fd5522",
+ "pk": "ea7d3b33-922f-4766-9f78-bd50815f81a5",
"fields": {
- "element": "b9f39256-6ff0-4daf-b56a-a5a316964133",
- "type": "word",
- "source": "1eaefd28-7475-47bb-aff5-b53a225e26ec",
+ "element": "e6b3aed3-c443-4df2-98c2-f7da41eaceec",
+ "type": "page",
+ "source": "13dc1bf7-e4d4-4cd9-b537-ecdcad7bd3c2",
"worker_version": null,
- "text": "PARIS",
+ "text": "Lorem ipsum dolor sit amet",
"score": 1.0
}
},
{
"model": "documents.allowedmetadata",
- "pk": "2ae06c55-5609-4a22-9ae3-d3ec5fe78582",
+ "pk": "06a9affa-d856-4b86-af15-d9bc02d123ff",
"fields": {
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "text",
- "name": "folio"
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "date",
+ "name": "date"
}
},
{
"model": "documents.allowedmetadata",
- "pk": "85f058a1-a3d3-43bc-8681-c11c5491e656",
+ "pk": "32e4f87f-248f-4c2f-8a0e-e8635ceee11c",
"fields": {
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "date",
- "name": "date"
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "location",
+ "name": "location"
}
},
{
"model": "documents.allowedmetadata",
- "pk": "d25ded48-d068-4fcd-a947-9a689ca271a8",
+ "pk": "3beaea8b-7c5a-4573-9e40-dc8b4fc07216",
"fields": {
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
- "type": "location",
- "name": "location"
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
+ "type": "text",
+ "name": "folio"
}
},
{
"model": "documents.metadata",
- "pk": "0706361e-7c9a-4dc0-b058-ad365f015d01",
+ "pk": "332b81d9-9b21-41f8-b5ea-5ec139a1fa68",
"fields": {
- "element": "99de88f1-9655-4bae-9203-01d56d097ef7",
- "name": "folio",
+ "element": "facee923-af23-4d71-8882-b20d621a66fd",
+ "name": "number",
"type": "text",
- "value": "1r",
+ "value": "1",
"revision": null,
"index": 0,
"entity": null
@@ -1004,9 +1004,9 @@
},
{
"model": "documents.metadata",
- "pk": "1000532c-4eb2-4d2b-91ac-1a8e7b743284",
+ "pk": "3b9d1aa1-1e89-4210-8bb4-a25e1609e243",
"fields": {
- "element": "35fb048c-f441-4e9d-bb69-78a8dfdb4598",
+ "element": "550014fa-b5b4-46ee-b70d-7c00bb913ac7",
"name": "folio",
"type": "text",
"value": "1v",
@@ -1017,9 +1017,9 @@
},
{
"model": "documents.metadata",
- "pk": "31edcdb5-5b70-4848-b890-fb88afe1d3e0",
+ "pk": "46f406b1-e240-4388-810e-9472133ba584",
"fields": {
- "element": "c4ccff42-93d3-4f66-a073-397dd85e1806",
+ "element": "19dfd0e1-1517-4674-8d28-0b0d402afce6",
"name": "number",
"type": "text",
"value": "5",
@@ -1030,12 +1030,12 @@
},
{
"model": "documents.metadata",
- "pk": "6a916e68-e8f1-455e-b0ab-f5947355187c",
+ "pk": "5dcf22cf-96a8-4b7a-8ce2-4694424c9ee9",
"fields": {
- "element": "b675ba10-f6ed-45cb-8a8c-449940471db5",
+ "element": "bee8c02b-98f6-4185-9897-762b62f73b3b",
"name": "number",
"type": "text",
- "value": "4",
+ "value": "3",
"revision": null,
"index": 0,
"entity": null
@@ -1043,12 +1043,12 @@
},
{
"model": "documents.metadata",
- "pk": "74fd04ea-9352-41c9-bdbf-24e36f49a305",
+ "pk": "764be013-755e-4751-9d1a-27c8218007c0",
"fields": {
- "element": "5130da8e-f2aa-477d-bf58-a2357efc8b2b",
+ "element": "e6b3aed3-c443-4df2-98c2-f7da41eaceec",
"name": "folio",
"type": "text",
- "value": "2r",
+ "value": "1r",
"revision": null,
"index": 0,
"entity": null
@@ -1056,12 +1056,12 @@
},
{
"model": "documents.metadata",
- "pk": "99164dd7-bc9c-49c9-89f6-a8ffc0be7779",
+ "pk": "97928b42-8b2c-4d67-b16e-51ff1e605892",
"fields": {
- "element": "c53fc91f-58c7-4fda-a92c-72a5f4051176",
- "name": "number",
+ "element": "4ad6a90c-f4ba-48e5-91ce-14d3bd3c6ba3",
+ "name": "folio",
"type": "text",
- "value": "3",
+ "value": "2r",
"revision": null,
"index": 0,
"entity": null
@@ -1069,12 +1069,12 @@
},
{
"model": "documents.metadata",
- "pk": "9c5602e4-1fb8-444f-b23d-6f9175eab2c9",
+ "pk": "bb86d930-3d04-47f8-b2a0-82f3ed1334d6",
"fields": {
- "element": "cbafeb68-d66a-4e1c-bcd4-47dd88b02eec",
+ "element": "c7295c75-b855-4b70-9475-a00e7ef9a572",
"name": "folio",
"type": "text",
- "value": "1v",
+ "value": "2r",
"revision": null,
"index": 0,
"entity": null
@@ -1082,12 +1082,12 @@
},
{
"model": "documents.metadata",
- "pk": "afce1c14-2ee8-46ed-9c78-4360562e91c2",
+ "pk": "be59424b-84e4-41bf-9dd0-52eac75ce1ec",
"fields": {
- "element": "ebdb0c60-e1e4-4f8a-a8b7-4127896ac194",
+ "element": "ad7283c3-6643-49e2-a966-2e5c55cf4638",
"name": "number",
"type": "text",
- "value": "2",
+ "value": "4",
"revision": null,
"index": 0,
"entity": null
@@ -1095,12 +1095,12 @@
},
{
"model": "documents.metadata",
- "pk": "cef63c02-d1b9-459b-88b2-771f3f9b7c87",
+ "pk": "d49cf820-76a2-4cd2-b085-bc09eca9586d",
"fields": {
- "element": "7e788454-afed-4bef-a370-bccf0dd3b2b4",
- "name": "number",
+ "element": "71c62984-5fec-4f8c-b821-8cd8c1349a72",
+ "name": "folio",
"type": "text",
- "value": "1",
+ "value": "1r",
"revision": null,
"index": 0,
"entity": null
@@ -1108,12 +1108,12 @@
},
{
"model": "documents.metadata",
- "pk": "e1850c59-5a05-438a-a49d-e8a99710671e",
+ "pk": "d8717e0b-6b62-4d82-92dc-0c1a4410dc8e",
"fields": {
- "element": "326843be-0112-4954-a2ea-da78aded01a9",
- "name": "folio",
+ "element": "84013d64-a85b-47c7-b734-722de1ae0d4b",
+ "name": "number",
"type": "text",
- "value": "1r",
+ "value": "2",
"revision": null,
"index": 0,
"entity": null
@@ -1121,12 +1121,12 @@
},
{
"model": "documents.metadata",
- "pk": "edeaf010-9326-4a0f-9e31-f403b8363be6",
+ "pk": "de13bd65-beea-41f7-8774-938e64084a90",
"fields": {
- "element": "7945d738-4a6e-4a76-ad57-21c03d63625d",
+ "element": "de4cd51c-3f98-4b97-92c7-fd8b7c15feea",
"name": "folio",
"type": "text",
- "value": "2r",
+ "value": "1v",
"revision": null,
"index": 0,
"entity": null
@@ -1150,12 +1150,12 @@
},
{
"model": "images.image",
- "pk": "5f4f5d85-42d7-48d0-bae3-6be0dfa1762f",
+ "pk": "081d902d-2008-4b06-b2c4-7acf0c9b2980",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img6",
+ "path": "img2",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1164,12 +1164,12 @@
},
{
"model": "images.image",
- "pk": "5f870efa-b012-4344-92ac-e5226c4cd26b",
+ "pk": "216c7280-1577-4be1-a645-52353fcf65ec",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img4",
+ "path": "img5",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1178,12 +1178,12 @@
},
{
"model": "images.image",
- "pk": "68474756-161a-4199-96e1-e79dc216a8a0",
+ "pk": "7ec02e33-b678-42ad-bde7-78b94bf4c2bb",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img2",
+ "path": "img3",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1192,12 +1192,12 @@
},
{
"model": "images.image",
- "pk": "75371cf1-e321-47ec-bbc3-16c7c3d8f89a",
+ "pk": "89ea15dd-5a7d-43e4-9a03-f1c6442feece",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img3",
+ "path": "img6",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1206,7 +1206,7 @@
},
{
"model": "images.image",
- "pk": "8f7f17ff-9555-488f-acac-9cb6814e46a8",
+ "pk": "cba07163-4df3-4320-94fc-6d4291df610c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
@@ -1220,12 +1220,12 @@
},
{
"model": "images.image",
- "pk": "996b53e8-4b88-473f-ad2e-11ea4848c14e",
+ "pk": "deac5fac-5c34-4f53-8afa-23f8a2ff313a",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img5",
+ "path": "img4",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1234,252 +1234,249 @@
},
{
"model": "images.zone",
- "pk": "0039b5f5-078f-4667-825c-6e620b92b59a",
+ "pk": "008f25e7-0068-40cd-a083-3292102b6242",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "75371cf1-e321-47ec-bbc3-16c7c3d8f89a",
- "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
+ "image": "cba07163-4df3-4320-94fc-6d4291df610c",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "0fb66d83-3d13-4d4e-82d1-1fd7fc82036f",
+ "pk": "0ce0b1e6-e1a2-45f4-93f1-f9986fd4eb2e",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "68474756-161a-4199-96e1-e79dc216a8a0",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "cba07163-4df3-4320-94fc-6d4291df610c",
+ "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
}
},
{
"model": "images.zone",
- "pk": "11bb6bba-8a2e-4f9e-97b1-0f48bc34103f",
+ "pk": "168d6610-a232-4f89-8ea7-9d26068e4845",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "5f4f5d85-42d7-48d0-bae3-6be0dfa1762f",
+ "image": "216c7280-1577-4be1-a645-52353fcf65ec",
"polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "272f32c2-29eb-47e7-b244-b0a6c2a772c0",
+ "pk": "1b7f99d7-4311-4b5a-a4e5-80e7d64f5597",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "75371cf1-e321-47ec-bbc3-16c7c3d8f89a",
- "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
+ "image": "081d902d-2008-4b06-b2c4-7acf0c9b2980",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "28c84829-8312-4f41-81e5-fa00fad02718",
+ "pk": "1eb1ca30-1799-4b77-b3e6-51effb20f969",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "8f7f17ff-9555-488f-acac-9cb6814e46a8",
- "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)"
+ "image": "7ec02e33-b678-42ad-bde7-78b94bf4c2bb",
+ "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)"
}
},
{
"model": "images.zone",
- "pk": "34f21948-295f-48a6-9644-41af328fdce4",
+ "pk": "2bef6a9f-4bb6-4464-aa32-1bbcfd30e22f",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "996b53e8-4b88-473f-ad2e-11ea4848c14e",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "081d902d-2008-4b06-b2c4-7acf0c9b2980",
+ "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
}
},
{
"model": "images.zone",
- "pk": "40edd01e-02e6-4fbf-b2c6-b7452a72c79e",
+ "pk": "3df5119c-08a6-4efe-8a1d-de7143beb38b",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "8f7f17ff-9555-488f-acac-9cb6814e46a8",
- "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
+ "image": "081d902d-2008-4b06-b2c4-7acf0c9b2980",
+ "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
}
},
{
"model": "images.zone",
- "pk": "440f85ff-25d9-4488-8654-98c5916df96f",
+ "pk": "41e685c0-9a8d-4802-8f72-d56bdb03c879",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "75371cf1-e321-47ec-bbc3-16c7c3d8f89a",
- "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)"
+ "image": "7ec02e33-b678-42ad-bde7-78b94bf4c2bb",
+ "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "6a85fb05-f7d1-498d-b93c-62739562c3e3",
+ "pk": "4d7d6a74-5061-4636-ae02-eae61177f089",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "75371cf1-e321-47ec-bbc3-16c7c3d8f89a",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "cba07163-4df3-4320-94fc-6d4291df610c",
+ "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
}
},
{
"model": "images.zone",
- "pk": "72e1be99-f517-48c4-b45a-808dea668ec0",
+ "pk": "5c419725-0a23-4bed-8b79-160187ea9ef0",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "8f7f17ff-9555-488f-acac-9cb6814e46a8",
- "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
+ "image": "89ea15dd-5a7d-43e4-9a03-f1c6442feece",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "7e767702-f644-451f-91e8-05423bb8e074",
+ "pk": "60978133-f6ad-4620-b8dc-f52053d30b97",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "75371cf1-e321-47ec-bbc3-16c7c3d8f89a",
- "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
+ "image": "7ec02e33-b678-42ad-bde7-78b94bf4c2bb",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "9bae7b8e-b03b-40cf-a0d8-80393d76a304",
+ "pk": "7430649a-eeb2-4e9b-9639-5a773b2f24bd",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "8f7f17ff-9555-488f-acac-9cb6814e46a8",
- "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)"
+ "image": "7ec02e33-b678-42ad-bde7-78b94bf4c2bb",
+ "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
}
},
{
"model": "images.zone",
- "pk": "a236763a-6d34-4c41-a1e5-a5e19d115d50",
+ "pk": "8ef76685-65b7-435b-b6eb-c80ca6d8710a",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "75371cf1-e321-47ec-bbc3-16c7c3d8f89a",
- "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)"
+ "image": "7ec02e33-b678-42ad-bde7-78b94bf4c2bb",
+ "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
}
},
{
"model": "images.zone",
- "pk": "aefbd01b-3421-458f-a8e6-2b5ffdaccc31",
+ "pk": "a26f7e91-a516-4598-a6d2-d43286fcf6b7",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "5f870efa-b012-4344-92ac-e5226c4cd26b",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "7ec02e33-b678-42ad-bde7-78b94bf4c2bb",
+ "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)"
}
},
{
"model": "images.zone",
- "pk": "b70d7b27-c973-44ba-93c5-602957ae491e",
+ "pk": "ac959187-0ff5-4c87-ae5b-ee47f1656b96",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "75371cf1-e321-47ec-bbc3-16c7c3d8f89a",
- "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)"
+ "image": "deac5fac-5c34-4f53-8afa-23f8a2ff313a",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "bea07b51-a5bd-400a-b5d0-b0320dc77bd1",
+ "pk": "b6c3f8c5-5b3d-4c6c-8e2c-6a4383bc0349",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "68474756-161a-4199-96e1-e79dc216a8a0",
- "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
+ "image": "cba07163-4df3-4320-94fc-6d4291df610c",
+ "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "c12fb064-b0df-4d8a-af13-55b2e9862e8d",
+ "pk": "dd1e7d88-a7bd-4444-8643-b99360267c42",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "68474756-161a-4199-96e1-e79dc216a8a0",
- "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
+ "image": "cba07163-4df3-4320-94fc-6d4291df610c",
+ "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)"
}
},
{
"model": "images.zone",
- "pk": "db138d8c-b5fc-46e6-8dc6-483a1ffc8bf6",
+ "pk": "e2fc38e5-f313-4b51-a364-3705a3875dfe",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "68474756-161a-4199-96e1-e79dc216a8a0",
- "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
+ "image": "081d902d-2008-4b06-b2c4-7acf0c9b2980",
+ "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
}
},
{
"model": "images.zone",
- "pk": "f96e2027-4568-4527-a469-bcf27f4fcbb2",
+ "pk": "e93d0bc9-bdd7-442f-aeee-e2454c6cf833",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "8f7f17ff-9555-488f-acac-9cb6814e46a8",
- "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
+ "image": "cba07163-4df3-4320-94fc-6d4291df610c",
+ "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
}
},
{
"model": "images.zone",
- "pk": "fb6dff0f-e117-48f0-b27a-9fa65f42a055",
+ "pk": "ecd9f9aa-ce91-4969-99a7-63e9dcbd8ca6",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "8f7f17ff-9555-488f-acac-9cb6814e46a8",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "7ec02e33-b678-42ad-bde7-78b94bf4c2bb",
+ "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
}
},
{
"model": "users.user",
"pk": 1,
"fields": {
- "password": "pbkdf2_sha256$216000$nxRE2ciWpZ7g$92fj1x7D47uAXNxwfbkSX8ffAeO03T28riqjHM5yJVk=",
+ "password": "pbkdf2_sha256$216000$9CLrlNBjYsHu$l7PPc5KJivmcUJU2nNR4kH44tc7EeAE170B3PCSBCI4=",
"last_login": null,
"email": "root@root.fr",
"transkribus_email": null,
"is_active": true,
"is_internal": false,
"is_admin": true,
- "verified_email": true,
- "groups": []
+ "verified_email": true
}
},
{
"model": "users.user",
"pk": 2,
"fields": {
- "password": "pbkdf2_sha256$216000$QEkgVJ40KttJ$98o0rhKrYu1vFJZ/+rOKk/D+oi52z6XGYIayxGO6P4I=",
+ "password": "pbkdf2_sha256$216000$r3zA0HxJh8He$JHSYUpAezr7yJUsmmsZxX2S5F/qZy/iuHDoQWPkqTlQ=",
"last_login": null,
"email": "internal@internal.fr",
"transkribus_email": null,
"is_active": true,
"is_internal": true,
"is_admin": false,
- "verified_email": true,
- "groups": []
+ "verified_email": true
}
},
{
"model": "users.user",
"pk": 3,
"fields": {
- "password": "pbkdf2_sha256$216000$mWYa0QHsUxjL$z8BQ0LObKxjCWFE29wIKXyRuL+rEtgWyGuboxc5DL1Q=",
+ "password": "pbkdf2_sha256$216000$HfrDffda4FCv$SEsBuKudVFpFNdyAYELIY+o/jRr8CwlfY9XaLkcX9UI=",
"last_login": null,
"email": "user@user.fr",
"transkribus_email": null,
"is_active": true,
"is_internal": false,
"is_admin": false,
- "verified_email": true,
- "groups": []
+ "verified_email": true
}
},
{
"model": "users.oauthcredentials",
- "pk": "b07d0cb3-65b7-45c4-9bf2-d7153f4d27cd",
+ "pk": "5665e36b-ae6c-4830-84ab-c283e363c1c5",
"fields": {
"user": 3,
"provider_name": "gitlab",
@@ -1496,7 +1493,7 @@
"pk": 1,
"fields": {
"user": 3,
- "corpus": "78d45b37-36d1-4576-8bb2-8e5844f31feb",
+ "corpus": "0549780c-bce1-445e-8f07-7e32889fe71e",
"can_write": true,
"can_admin": true
}
@@ -2765,329 +2762,401 @@
"model": "auth.permission",
"pk": 141,
"fields": {
- "name": "Can add data file",
+ "name": "Can add group",
"content_type": 36,
- "codename": "add_datafile"
+ "codename": "add_group"
}
},
{
"model": "auth.permission",
"pk": 142,
"fields": {
- "name": "Can change data file",
+ "name": "Can change group",
"content_type": 36,
- "codename": "change_datafile"
+ "codename": "change_group"
}
},
{
"model": "auth.permission",
"pk": 143,
"fields": {
- "name": "Can delete data file",
+ "name": "Can delete group",
"content_type": 36,
- "codename": "delete_datafile"
+ "codename": "delete_group"
}
},
{
"model": "auth.permission",
"pk": 144,
"fields": {
- "name": "Can view data file",
+ "name": "Can view group",
"content_type": 36,
- "codename": "view_datafile"
+ "codename": "view_group"
}
},
{
"model": "auth.permission",
"pk": 145,
"fields": {
- "name": "Can add data import",
+ "name": "Can add membership",
"content_type": 37,
- "codename": "add_dataimport"
+ "codename": "add_membership"
}
},
{
"model": "auth.permission",
"pk": 146,
"fields": {
- "name": "Can change data import",
+ "name": "Can change membership",
"content_type": 37,
- "codename": "change_dataimport"
+ "codename": "change_membership"
}
},
{
"model": "auth.permission",
"pk": 147,
"fields": {
- "name": "Can delete data import",
+ "name": "Can delete membership",
"content_type": 37,
- "codename": "delete_dataimport"
+ "codename": "delete_membership"
}
},
{
"model": "auth.permission",
"pk": 148,
"fields": {
- "name": "Can view data import",
+ "name": "Can view membership",
"content_type": 37,
- "codename": "view_dataimport"
+ "codename": "view_membership"
}
},
{
"model": "auth.permission",
"pk": 149,
"fields": {
- "name": "Can add repository",
+ "name": "Can add data file",
"content_type": 38,
- "codename": "add_repository"
+ "codename": "add_datafile"
}
},
{
"model": "auth.permission",
"pk": 150,
"fields": {
- "name": "Can change repository",
+ "name": "Can change data file",
"content_type": 38,
- "codename": "change_repository"
+ "codename": "change_datafile"
}
},
{
"model": "auth.permission",
"pk": 151,
"fields": {
- "name": "Can delete repository",
+ "name": "Can delete data file",
"content_type": 38,
- "codename": "delete_repository"
+ "codename": "delete_datafile"
}
},
{
"model": "auth.permission",
"pk": 152,
"fields": {
- "name": "Can view repository",
+ "name": "Can view data file",
"content_type": 38,
- "codename": "view_repository"
+ "codename": "view_datafile"
}
},
{
"model": "auth.permission",
"pk": 153,
"fields": {
- "name": "Can add revision",
+ "name": "Can add data import",
"content_type": 39,
- "codename": "add_revision"
+ "codename": "add_dataimport"
}
},
{
"model": "auth.permission",
"pk": 154,
"fields": {
- "name": "Can change revision",
+ "name": "Can change data import",
"content_type": 39,
- "codename": "change_revision"
+ "codename": "change_dataimport"
}
},
{
"model": "auth.permission",
"pk": 155,
"fields": {
- "name": "Can delete revision",
+ "name": "Can delete data import",
"content_type": 39,
- "codename": "delete_revision"
+ "codename": "delete_dataimport"
}
},
{
"model": "auth.permission",
"pk": 156,
"fields": {
- "name": "Can view revision",
+ "name": "Can view data import",
"content_type": 39,
- "codename": "view_revision"
+ "codename": "view_dataimport"
}
},
{
"model": "auth.permission",
"pk": 157,
"fields": {
- "name": "Can add worker",
+ "name": "Can add repository",
"content_type": 40,
- "codename": "add_worker"
+ "codename": "add_repository"
}
},
{
"model": "auth.permission",
"pk": 158,
"fields": {
- "name": "Can change worker",
+ "name": "Can change repository",
"content_type": 40,
- "codename": "change_worker"
+ "codename": "change_repository"
}
},
{
"model": "auth.permission",
"pk": 159,
"fields": {
- "name": "Can delete worker",
+ "name": "Can delete repository",
"content_type": 40,
- "codename": "delete_worker"
+ "codename": "delete_repository"
}
},
{
"model": "auth.permission",
"pk": 160,
"fields": {
- "name": "Can view worker",
+ "name": "Can view repository",
"content_type": 40,
- "codename": "view_worker"
+ "codename": "view_repository"
}
},
{
"model": "auth.permission",
"pk": 161,
"fields": {
- "name": "Can add worker version",
+ "name": "Can add revision",
"content_type": 41,
- "codename": "add_workerversion"
+ "codename": "add_revision"
}
},
{
"model": "auth.permission",
"pk": 162,
"fields": {
- "name": "Can change worker version",
+ "name": "Can change revision",
"content_type": 41,
- "codename": "change_workerversion"
+ "codename": "change_revision"
}
},
{
"model": "auth.permission",
"pk": 163,
"fields": {
- "name": "Can delete worker version",
+ "name": "Can delete revision",
"content_type": 41,
- "codename": "delete_workerversion"
+ "codename": "delete_revision"
}
},
{
"model": "auth.permission",
"pk": 164,
"fields": {
- "name": "Can view worker version",
+ "name": "Can view revision",
"content_type": 41,
- "codename": "view_workerversion"
+ "codename": "view_revision"
}
},
{
"model": "auth.permission",
"pk": 165,
"fields": {
- "name": "Can add git ref",
+ "name": "Can add worker",
"content_type": 42,
- "codename": "add_gitref"
+ "codename": "add_worker"
}
},
{
"model": "auth.permission",
"pk": 166,
"fields": {
- "name": "Can change git ref",
+ "name": "Can change worker",
"content_type": 42,
- "codename": "change_gitref"
+ "codename": "change_worker"
}
},
{
"model": "auth.permission",
"pk": 167,
"fields": {
- "name": "Can delete git ref",
+ "name": "Can delete worker",
"content_type": 42,
- "codename": "delete_gitref"
+ "codename": "delete_worker"
}
},
{
"model": "auth.permission",
"pk": 168,
"fields": {
- "name": "Can view git ref",
+ "name": "Can view worker",
"content_type": 42,
- "codename": "view_gitref"
+ "codename": "view_worker"
}
},
{
"model": "auth.permission",
"pk": 169,
"fields": {
- "name": "Can add worker run",
+ "name": "Can add worker version",
"content_type": 43,
- "codename": "add_workerrun"
+ "codename": "add_workerversion"
}
},
{
"model": "auth.permission",
"pk": 170,
"fields": {
- "name": "Can change worker run",
+ "name": "Can change worker version",
"content_type": 43,
- "codename": "change_workerrun"
+ "codename": "change_workerversion"
}
},
{
"model": "auth.permission",
"pk": 171,
"fields": {
- "name": "Can delete worker run",
+ "name": "Can delete worker version",
"content_type": 43,
- "codename": "delete_workerrun"
+ "codename": "delete_workerversion"
}
},
{
"model": "auth.permission",
"pk": 172,
"fields": {
- "name": "Can view worker run",
+ "name": "Can view worker version",
"content_type": 43,
- "codename": "view_workerrun"
+ "codename": "view_workerversion"
}
},
{
"model": "auth.permission",
"pk": 173,
"fields": {
- "name": "Can add data import element",
+ "name": "Can add git ref",
"content_type": 44,
- "codename": "add_dataimportelement"
+ "codename": "add_gitref"
}
},
{
"model": "auth.permission",
"pk": 174,
"fields": {
- "name": "Can change data import element",
+ "name": "Can change git ref",
"content_type": 44,
- "codename": "change_dataimportelement"
+ "codename": "change_gitref"
}
},
{
"model": "auth.permission",
"pk": 175,
"fields": {
- "name": "Can delete data import element",
+ "name": "Can delete git ref",
"content_type": 44,
- "codename": "delete_dataimportelement"
+ "codename": "delete_gitref"
}
},
{
"model": "auth.permission",
"pk": 176,
"fields": {
- "name": "Can view data import element",
+ "name": "Can view git ref",
"content_type": 44,
+ "codename": "view_gitref"
+ }
+},
+{
+ "model": "auth.permission",
+ "pk": 177,
+ "fields": {
+ "name": "Can add worker run",
+ "content_type": 45,
+ "codename": "add_workerrun"
+ }
+},
+{
+ "model": "auth.permission",
+ "pk": 178,
+ "fields": {
+ "name": "Can change worker run",
+ "content_type": 45,
+ "codename": "change_workerrun"
+ }
+},
+{
+ "model": "auth.permission",
+ "pk": 179,
+ "fields": {
+ "name": "Can delete worker run",
+ "content_type": 45,
+ "codename": "delete_workerrun"
+ }
+},
+{
+ "model": "auth.permission",
+ "pk": 180,
+ "fields": {
+ "name": "Can view worker run",
+ "content_type": 45,
+ "codename": "view_workerrun"
+ }
+},
+{
+ "model": "auth.permission",
+ "pk": 181,
+ "fields": {
+ "name": "Can add data import element",
+ "content_type": 46,
+ "codename": "add_dataimportelement"
+ }
+},
+{
+ "model": "auth.permission",
+ "pk": 182,
+ "fields": {
+ "name": "Can change data import element",
+ "content_type": 46,
+ "codename": "change_dataimportelement"
+ }
+},
+{
+ "model": "auth.permission",
+ "pk": 183,
+ "fields": {
+ "name": "Can delete data import element",
+ "content_type": 46,
+ "codename": "delete_dataimportelement"
+ }
+},
+{
+ "model": "auth.permission",
+ "pk": 184,
+ "fields": {
+ "name": "Can view data import element",
+ "content_type": 46,
"codename": "view_dataimportelement"
}
},
{
"model": "ponos.workflow",
- "pk": "1fb1e3f8-67e4-45dd-acc8-1bdedf4e6f98",
+ "pk": "c7d0fc3f-2189-494e-a124-a5179e09fe8d",
"fields": {
"recipe": "tasks:\n docker_build:\n image: reco",
"created": "2020-02-02T01:23:45.678Z",
@@ -3096,7 +3165,7 @@
},
{
"model": "ponos.task",
- "pk": "a9d5d4ce-188e-4659-9f35-4de56a3e3e1d",
+ "pk": "4511527d-e7fb-45f1-be81-2727e81eb148",
"fields": {
"run": 0,
"depth": 0,
@@ -3109,7 +3178,7 @@
"has_docker_socket": false,
"image_artifact": null,
"agent": null,
- "workflow": "1fb1e3f8-67e4-45dd-acc8-1bdedf4e6f98",
+ "workflow": "c7d0fc3f-2189-494e-a124-a5179e09fe8d",
"container": null,
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
@@ -3118,9 +3187,9 @@
},
{
"model": "ponos.artifact",
- "pk": "2f4c9981-6ee0-43a1-80f0-54cca23be3ff",
+ "pk": "462af040-499c-4b7b-85d1-25d2d1b349e8",
"fields": {
- "task": "a9d5d4ce-188e-4659-9f35-4de56a3e3e1d",
+ "task": "4511527d-e7fb-45f1-be81-2727e81eb148",
"path": "/path/to/docker_build",
"size": 42000,
"content_type": "application/octet-stream",
diff --git a/arkindex/users/admin.py b/arkindex/users/admin.py
index 0b240e09f57f794fb960ce29dd2f947860bfa1af..6e7a706b28ae56cf04f078d3e2d9324a32a37d71 100644
--- a/arkindex/users/admin.py
+++ b/arkindex/users/admin.py
@@ -2,10 +2,10 @@ from django import forms
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.forms import ReadOnlyPasswordHashField
-from django.contrib.auth.models import Group
+from django.contrib.auth.models import Group as BaseGroup
from enumfields.admin import EnumFieldListFilter
-from arkindex.users.models import CorpusRight, User, UserScope
+from arkindex.users.models import CorpusRight, Group, User, UserScope
class UserCreationForm(forms.ModelForm):
@@ -90,8 +90,18 @@ class UserScopeAdmin(admin.ModelAdmin):
list_filter = [('scope', EnumFieldListFilter), ]
-# Now register the new UserAdmin...
+class MembershipInline(admin.TabularInline):
+ model = Group.users.through
+
+
+class GroupAdmin(admin.ModelAdmin):
+ list_display = ('id', 'name', 'public')
+ inlines = (MembershipInline, )
+
+
admin.site.register(User, UserAdmin)
-# and hide the unused Group admin
-admin.site.unregister(Group)
+# Register the custom GroupAdmin
+admin.site.register(Group, GroupAdmin)
+# and hide base GroupAdmin form contrib.auth
+admin.site.unregister(BaseGroup)
admin.site.register(UserScope, UserScopeAdmin)
diff --git a/arkindex/users/migrations/0006_update_group_and_membership.py b/arkindex/users/migrations/0006_update_group_and_membership.py
new file mode 100644
index 0000000000000000000000000000000000000000..32e19fc087f1f1f69cfaf1e9245eb32ce4c5cefc
--- /dev/null
+++ b/arkindex/users/migrations/0006_update_group_and_membership.py
@@ -0,0 +1,43 @@
+# Generated by Django 3.1.3 on 2020-11-16 14:40
+
+import uuid
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0005_user_transkribus_email'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Group',
+ fields=[
+ ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+ ('name', models.CharField(max_length=64)),
+ ('public', models.BooleanField(default=False)),
+ ],
+ ),
+ migrations.RemoveField(
+ model_name='user',
+ name='groups',
+ ),
+ migrations.CreateModel(
+ name='Membership',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('level', models.PositiveIntegerField(default=0, help_text='User privilege level.')),
+ ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to='users.group')),
+ ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='memberships', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.AddField(
+ model_name='group',
+ name='users',
+ field=models.ManyToManyField(related_name='groups', through='users.Membership', to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/arkindex/users/models.py b/arkindex/users/models.py
index dd01d6d03c35ddd3584bc881a6f934985fbd16d9..f7d9fcb5d9364ac292b5e95da5d4e1b35e1e0c43 100644
--- a/arkindex/users/models.py
+++ b/arkindex/users/models.py
@@ -1,6 +1,6 @@
import uuid
-from django.contrib.auth.models import AbstractBaseUser, Group
+from django.contrib.auth.models import AbstractBaseUser
from django.db import models
from enumfields import Enum, EnumField
@@ -24,12 +24,6 @@ class User(AbstractBaseUser):
is_admin = models.BooleanField(default=False)
verified_email = models.BooleanField(default=False)
- groups = models.ManyToManyField(
- Group,
- blank=True,
- related_name="users",
- )
-
corpus = models.ManyToManyField('documents.Corpus', through='users.CorpusRight')
selected_elements = models.ManyToManyField(
@@ -74,6 +68,24 @@ class User(AbstractBaseUser):
return self.is_admin
+class Group(models.Model):
+ id = models.UUIDField(default=uuid.uuid4, primary_key=True, editable=False)
+ name = models.CharField(max_length=64)
+ public = models.BooleanField(default=False)
+
+ users = models.ManyToManyField(
+ User,
+ through='Membership',
+ related_name='groups',
+ )
+
+
+class Membership(models.Model):
+ user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='memberships')
+ group = models.ForeignKey(Group, on_delete=models.CASCADE, related_name='memberships')
+ level = models.PositiveIntegerField(default=0, help_text='User privilege level.')
+
+
class OAuthStatus(Enum):
Created = 'created'
Done = 'done'