From 8bc860a39895c78cabb8a3d36a093beec4cb92c9 Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Thu, 12 Jul 2018 09:31:30 -0400 Subject: [PATCH 1/5] adding street to institution schema --- regolith/schemas.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/regolith/schemas.py b/regolith/schemas.py index 611434aad..9da25b1e2 100644 --- a/regolith/schemas.py +++ b/regolith/schemas.py @@ -257,6 +257,7 @@ } }, "state": "NY", + "street": "500 W 120th St" "zip": "10027", }, "jobs": { @@ -1276,6 +1277,11 @@ "required": False, "type": "string", }, + "street": { + "description": "the street address of the institution", + "required": False, + "type": "string", + }, "zip": { "description": "the zip or postal code of the institution", "required": False, From e02fb6bce9d0fb7b6c407f1f353745125cd60f39 Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Sat, 14 Jul 2018 02:51:25 -0400 Subject: [PATCH 2/5] got rid of rogue 10027. Not sure how it got there --- regolith/schemas.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regolith/schemas.py b/regolith/schemas.py index 9da25b1e2..363a0ac33 100644 --- a/regolith/schemas.py +++ b/regolith/schemas.py @@ -257,7 +257,7 @@ } }, "state": "NY", - "street": "500 W 120th St" + "street": "500 W 120th St", "zip": "10027", }, "jobs": { @@ -679,7 +679,7 @@ "narrative": "http://some.com/pdf", "year": 1998, }, - "status": "submitted", + "status": "submitted", "title": "A very fine proposal indeed", "year": 1999, }, From 25effa8dfe5abd629b4a2347f51beb0cf9fc0734 Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Sat, 14 Jul 2018 05:07:13 -0400 Subject: [PATCH 3/5] news --- news/clean_institutions_schema.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 news/clean_institutions_schema.rst diff --git a/news/clean_institutions_schema.rst b/news/clean_institutions_schema.rst new file mode 100644 index 000000000..29729c9a3 --- /dev/null +++ b/news/clean_institutions_schema.rst @@ -0,0 +1,13 @@ +**Added:** None + +**Changed:** + +* institutions schema to add street and make conditionals work better + +**Deprecated:** None + +**Removed:** None + +**Fixed:** None + +**Security:** None From b70ffbe7bfe20086ad533ac20339aacc1edaa5ba Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Sat, 27 Jul 2019 14:29:11 -0400 Subject: [PATCH 4/5] institutions schema now working. also groups added banner --- regolith/schemas.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/regolith/schemas.py b/regolith/schemas.py index 363a0ac33..c8dd122fe 100644 --- a/regolith/schemas.py +++ b/regolith/schemas.py @@ -1164,6 +1164,11 @@ "type": "list", "description": "other names for the group", }, + "banner": { + "required": False, + "type": "string", + "description": "name of image file with the group banner", + }, "pi_name": { "description": "The name of the Principle Investigator", "required": True, From 8a231e024865719710fb6dd9a82e6ec61ae5d4b8 Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Sat, 27 Jul 2019 14:31:46 -0400 Subject: [PATCH 5/5] news --- news/clean_institutions_schema.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/news/clean_institutions_schema.rst b/news/clean_institutions_schema.rst index 29729c9a3..198032d65 100644 --- a/news/clean_institutions_schema.rst +++ b/news/clean_institutions_schema.rst @@ -1,4 +1,6 @@ -**Added:** None +**Added:** + +* added banner to groups schema, which is an image for website banner **Changed:**