diff --git a/dataedit/static/peer_review/opr_contributor.js b/dataedit/static/peer_review/opr_contributor.js index 9a377fdf9..09e3cabf2 100644 --- a/dataedit/static/peer_review/opr_contributor.js +++ b/dataedit/static/peer_review/opr_contributor.js @@ -278,7 +278,6 @@ function getCategoryToTabIdMapping() { 'temporal': 'spatiotemporal-tab', 'source': 'source-tab', 'license': 'license-tab', - 'contributor': 'contributor-tab', }; return mapping; } @@ -678,7 +677,7 @@ function updateSubmitButtonColor() { function updateTabProgressIndicatorClasses() { - const tabNames = ['general', 'spatiotemporal', 'source', 'license', 'contributor']; + const tabNames = ['general', 'spatiotemporal', 'source', 'license']; for (let i = 0; i < tabNames.length; i++) { let tabName = tabNames[i]; @@ -699,7 +698,7 @@ function updateTabProgressIndicatorClasses() { function updateTabClasses() { - const tabNames = ['general', 'spatiotemporal', 'source', 'license', 'contributor']; + const tabNames = ['general', 'spatiotemporal', 'source', 'license']; for (let i = 0; i < tabNames.length; i++) { let tabName = tabNames[i]; let tab = document.getElementById(tabName + '-tab'); @@ -740,7 +739,6 @@ document.addEventListener('DOMContentLoaded', function() { document.getElementById('spatiotemporal-tab'), document.getElementById('source-tab'), document.getElementById('license-tab'), - document.getElementById('contributor-tab'), ]; const reviewContent = document.querySelector(".review__content"); diff --git a/dataedit/static/peer_review/opr_reviewer.js b/dataedit/static/peer_review/opr_reviewer.js index a484ac3b7..8bef27271 100644 --- a/dataedit/static/peer_review/opr_reviewer.js +++ b/dataedit/static/peer_review/opr_reviewer.js @@ -307,7 +307,6 @@ function getCategoryToTabIdMapping() { 'temporal': 'spatiotemporal-tab', 'source': 'source-tab', 'license': 'license-tab', - 'contributor': 'contributor-tab', }; return mapping; } @@ -837,11 +836,10 @@ const otherTabs = [ document.getElementById('spatiotemporal-tab'), document.getElementById('source-tab'), document.getElementById('license-tab'), - document.getElementById('contributor-tab'), ]; const reviewContent = document.querySelector(".review__content"); function updateTabClasses() { - const tabNames = ['general', 'spatiotemporal', 'source', 'license', 'contributor']; + const tabNames = ['general', 'spatiotemporal', 'source', 'license']; for (let i = 0; i < tabNames.length; i++) { let tabName = tabNames[i]; let tab = document.getElementById(tabName + '-tab'); @@ -896,7 +894,7 @@ function updatePercentageDisplay() { function updateTabProgressIndicatorClasses() { - const tabNames = ['general', 'spatiotemporal', 'source', 'license', 'contributor']; + const tabNames = ['general', 'spatiotemporal', 'source', 'license']; for (let i = 0; i < tabNames.length; i++) { let tabName = tabNames[i]; diff --git a/dataedit/templates/dataedit/opr_contributor.html b/dataedit/templates/dataedit/opr_contributor.html index 554812452..683ce9a00 100644 --- a/dataedit/templates/dataedit/opr_contributor.html +++ b/dataedit/templates/dataedit/opr_contributor.html @@ -81,9 +81,7 @@ - + @@ -209,25 +207,6 @@ {% endfor %} -
-
- {% for item in meta.contributor %} -
-

- {% if item.field is Null %} - {{item.field}} - {{ item.value }} - {% else %} - {{item.field}} - {{ item.newValue|default:item.value }} - {{ item.reviewer_suggestion }} - {{ item.suggestion_comment }} - {% endif %} -

-
- {% endfor %} -
-
diff --git a/dataedit/templates/dataedit/opr_review.html b/dataedit/templates/dataedit/opr_review.html index b468650b2..94789ec92 100644 --- a/dataedit/templates/dataedit/opr_review.html +++ b/dataedit/templates/dataedit/opr_review.html @@ -80,9 +80,6 @@ - @@ -206,25 +203,6 @@ {% endfor %} -
-
- {% for item in meta.contributor %} -
-

- {% if item.field is Null %} - {{item.field}} - {{ item.value }} - {% else %} - {{item.field}} - {{ item.newValue|default:item.value }} - {{ item.reviewer_suggestion }} - {{ item.suggestion_comment }} - {% endif %} -

-
- {% endfor %} -
-
{% for item in meta.resource %} diff --git a/dataedit/views.py b/dataedit/views.py index e07a82f70..5638e1403 100644 --- a/dataedit/views.py +++ b/dataedit/views.py @@ -1968,7 +1968,6 @@ def sort_in_category(self, schema, table, oemetadata): "temporal": [...], "source": [...], "license": [...], - "contributor": [...], } """ @@ -1979,7 +1978,6 @@ def sort_in_category(self, schema, table, oemetadata): temporal_key_list = [] source_key_list = [] license_key_list = [] - contributor_key_list = [] for i in val: fieldKey = list(i.values())[0] @@ -1991,8 +1989,7 @@ def sort_in_category(self, schema, table, oemetadata): source_key_list.append(i) elif fieldKey.split(".")[0] == "licenses": license_key_list.append(i) - elif fieldKey.split(".")[0] == "contributors": - contributor_key_list.append(i) + elif ( fieldKey.split(".")[0] == "name" or fieldKey.split(".")[0] == "title" @@ -2012,7 +2009,6 @@ def sort_in_category(self, schema, table, oemetadata): "temporal": temporal_key_list, "source": source_key_list, "license": license_key_list, - "contributor": contributor_key_list, } return meta @@ -2107,7 +2103,6 @@ def get(self, request, schema, table, review_id=None): "temporal", "source", "license", - "contributor", ] state_dict = process_review_data( review_data=existing_review, metadata=metadata, categories=categories @@ -2302,7 +2297,6 @@ def get(self, request, schema, table, review_id): "temporal", "source", "license", - "contributor", ] state_dict = process_review_data( review_data=review_data, metadata=metadata, categories=categories