From 16021759275fbd00cb748f256543404f3081f323 Mon Sep 17 00:00:00 2001 From: William Moore Date: Tue, 8 Nov 2016 13:24:26 +0000 Subject: [PATCH 01/11] Test updating a Project with Datasets --- .../tools/OmeroWeb/omeroweb/api/views.py | 4 +++ .../test/integration/test_api_projects.py | 33 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/components/tools/OmeroWeb/omeroweb/api/views.py b/components/tools/OmeroWeb/omeroweb/api/views.py index 14a3c63fef1..0df199e3668 100644 --- a/components/tools/OmeroWeb/omeroweb/api/views.py +++ b/components/tools/OmeroWeb/omeroweb/api/views.py @@ -248,6 +248,10 @@ def _save_object(self, request, conn, object_json, **kwargs): # Therefore we ignore any details for now: obj.unloadDetails() + # For now, we don't try to save Project's linked Datasets + if hasattr(obj, 'unloadDatasetLinks'): + obj.unloadDatasetLinks() + conn.SERVICE_OPTS.setOmeroGroup(group) obj = conn.getUpdateService().saveAndReturnObject(obj, conn.SERVICE_OPTS) diff --git a/components/tools/OmeroWeb/test/integration/test_api_projects.py b/components/tools/OmeroWeb/test/integration/test_api_projects.py index 76c9f7d606b..c2192790e50 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_projects.py +++ b/components/tools/OmeroWeb/test/integration/test_api_projects.py @@ -563,6 +563,39 @@ def test_project_update(self, user1): assert pr_json['Name'] == 'updated name' assert 'Description' not in pr_json + def test_project_datasets_update(self, user1): + """ + Test updating a Project without losing child Datasets. + + If we load a Project without loading Datasets, then update + and save the Project, we don't want to lose Dataset links + """ + conn = get_connection(user1) + group = conn.getEventContext().groupId + user_name = conn.getUser().getName() + django_client = self.new_django_client(user_name, user_name) + + project = ProjectI() + project.name = rstring('test_project_datasets_update') + dataset = DatasetI() + dataset.name = rstring('Dataset') + project.linkDataset(dataset) + project = get_update_service(user1).saveAndReturnObject(project) + + version = settings.API_VERSIONS[-1] + project_url = reverse('api_project', kwargs={'api_version': version, + 'pid': project.id.val}) + save_url = reverse('api_save', kwargs={'api_version': version}) + # Get Project, update and save back + project_json = _get_response_json(django_client, project_url, {}) + project_json['Name'] = 'renamed Project' + rsp = _csrf_put_json(django_client, save_url, project_json) + + # Check Project has been updated and still has child Datasets + proj = conn.getObject('Project', project.id.val) + assert proj.getName() == 'renamed Project' + assert len(list(proj.listChildren())) == 1 + def test_project_delete(self, user1): conn = get_connection(user1) user_name = conn.getUser().getName() From 47ca06327c91b7faefa328c28af7fbf66ed6c168 Mon Sep 17 00:00:00 2001 From: William Moore Date: Tue, 8 Nov 2016 16:34:11 +0000 Subject: [PATCH 02/11] flake8 fixes --- .../tools/OmeroWeb/test/integration/test_api_projects.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/tools/OmeroWeb/test/integration/test_api_projects.py b/components/tools/OmeroWeb/test/integration/test_api_projects.py index c2192790e50..5bf7b6058db 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_projects.py +++ b/components/tools/OmeroWeb/test/integration/test_api_projects.py @@ -571,7 +571,6 @@ def test_project_datasets_update(self, user1): and save the Project, we don't want to lose Dataset links """ conn = get_connection(user1) - group = conn.getEventContext().groupId user_name = conn.getUser().getName() django_client = self.new_django_client(user_name, user_name) @@ -589,7 +588,7 @@ def test_project_datasets_update(self, user1): # Get Project, update and save back project_json = _get_response_json(django_client, project_url, {}) project_json['Name'] = 'renamed Project' - rsp = _csrf_put_json(django_client, save_url, project_json) + _csrf_put_json(django_client, save_url, project_json) # Check Project has been updated and still has child Datasets proj = conn.getObject('Project', project.id.val) From 9358d1fe02a7817ef5f218f10c35d753de6db9b1 Mon Sep 17 00:00:00 2001 From: William Moore Date: Thu, 10 Nov 2016 15:53:50 +0000 Subject: [PATCH 03/11] Add test_project_tags_update to test_api_projects.py --- .../test/integration/test_api_projects.py | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/components/tools/OmeroWeb/test/integration/test_api_projects.py b/components/tools/OmeroWeb/test/integration/test_api_projects.py index 5bf7b6058db..6f85ec5cbb1 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_projects.py +++ b/components/tools/OmeroWeb/test/integration/test_api_projects.py @@ -28,7 +28,7 @@ from django.test import Client import pytest from omero.gateway import BlitzGateway -from omero.model import ProjectI, DatasetI +from omero.model import ProjectI, DatasetI, TagAnnotationI from omero.rtypes import unwrap, rstring from omero_marshal import get_encoder, OME_SCHEMA_URL @@ -595,6 +595,39 @@ def test_project_datasets_update(self, user1): assert proj.getName() == 'renamed Project' assert len(list(proj.listChildren())) == 1 + def test_project_tags_update(self, user1): + """ + Test updating a Project without losing linked Tags. + + If we load a Project without loading Annotations, then update + and save the Project, we don't want to lose Annotation links + """ + conn = get_connection(user1) + user_name = conn.getUser().getName() + django_client = self.new_django_client(user_name, user_name) + + project = ProjectI() + project.name = rstring('test_project_tags_update') + tag = TagAnnotationI() + tag.textValue = rstring('tag') + project.linkAnnotation(tag) + project = get_update_service(user1).saveAndReturnObject(project) + + version = settings.API_VERSIONS[-1] + project_url = reverse('api_project', kwargs={'api_version': version, + 'pid': project.id.val}) + save_url = reverse('api_save', kwargs={'api_version': version}) + # Get Project, update and save back + project_json = _get_response_json(django_client, project_url, {}) + project_json['Name'] = 'renamed Project' + _csrf_put_json(django_client, save_url, project_json) + + # Check Project has been updated and still has annotation links + proj = conn.getObject('Project', project.id.val) + assert proj.getName() == 'renamed Project' + assert len(list(proj.listAnnotations())) == 1 + assert False + def test_project_delete(self, user1): conn = get_connection(user1) user_name = conn.getUser().getName() From 99e20f656d572a37de6bc3a0009e85f34d8c756a Mon Sep 17 00:00:00 2001 From: William Moore Date: Mon, 14 Nov 2016 10:10:11 +0000 Subject: [PATCH 04/11] Remove accidentally-added 'assert False' --- components/tools/OmeroWeb/test/integration/test_api_projects.py | 1 - 1 file changed, 1 deletion(-) diff --git a/components/tools/OmeroWeb/test/integration/test_api_projects.py b/components/tools/OmeroWeb/test/integration/test_api_projects.py index 6f85ec5cbb1..67e75d7ff63 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_projects.py +++ b/components/tools/OmeroWeb/test/integration/test_api_projects.py @@ -626,7 +626,6 @@ def test_project_tags_update(self, user1): proj = conn.getObject('Project', project.id.val) assert proj.getName() == 'renamed Project' assert len(list(proj.listAnnotations())) == 1 - assert False def test_project_delete(self, user1): conn = get_connection(user1) From 6d3555aac9dfe675a8af343a09f8a1e31515a69b Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 1 Mar 2017 00:02:16 +0000 Subject: [PATCH 05/11] flake8 and test fixes --- .../test/integration/test_api_projects.py | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/components/tools/OmeroWeb/test/integration/test_api_projects.py b/components/tools/OmeroWeb/test/integration/test_api_projects.py index ce335a9953a..aec7330d9b9 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_projects.py +++ b/components/tools/OmeroWeb/test/integration/test_api_projects.py @@ -618,12 +618,14 @@ def test_project_datasets_update(self, user1): project.linkDataset(dataset) project = get_update_service(user1).saveAndReturnObject(project) - version = settings.API_VERSIONS[-1] - project_url = reverse('api_project', kwargs={'api_version': version, - 'pid': project.id.val}) + version = api_settings.API_VERSIONS[-1] + project_url = reverse('api_project', + kwargs={'api_version': version, + 'object_id': project.id.val}) save_url = reverse('api_save', kwargs={'api_version': version}) # Get Project, update and save back - project_json = _get_response_json(django_client, project_url, {}) + rsp = _get_response_json(django_client, project_url, {}) + project_json = rsp['data'] project_json['Name'] = 'renamed Project' _csrf_put_json(django_client, save_url, project_json) @@ -650,12 +652,14 @@ def test_project_tags_update(self, user1): project.linkAnnotation(tag) project = get_update_service(user1).saveAndReturnObject(project) - version = settings.API_VERSIONS[-1] - project_url = reverse('api_project', kwargs={'api_version': version, - 'pid': project.id.val}) + version = api_settings.API_VERSIONS[-1] + project_url = reverse('api_project', + kwargs={'api_version': version, + 'object_id': project.id.val}) save_url = reverse('api_save', kwargs={'api_version': version}) # Get Project, update and save back - project_json = _get_response_json(django_client, project_url, {}) + rsp = _get_response_json(django_client, project_url, {}) + project_json = rsp['data'] project_json['Name'] = 'renamed Project' _csrf_put_json(django_client, save_url, project_json) From 5799485ae9675482670e6022666e8d7ceb02158b Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 1 Mar 2017 13:50:26 +0000 Subject: [PATCH 06/11] Test children not unlinked on update of Dataset & Screen --- .../test/integration/test_api_containers.py | 23 +++++++++++++++ .../test/integration/test_api_projects.py | 28 +++++++++++++------ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/components/tools/OmeroWeb/test/integration/test_api_containers.py b/components/tools/OmeroWeb/test/integration/test_api_containers.py index 124c0ad0a7c..ea727ad4c20 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_containers.py +++ b/components/tools/OmeroWeb/test/integration/test_api_containers.py @@ -410,6 +410,29 @@ def test_screens(self, user1, user_screens): assert_objects(conn, rsp['data'], user_screens, dtype="Screen", extra=extra) + def test_screen_plates_update(self, user1, screen_plates): + """Test update of Screen doesn't break links to Plate.""" + conn = get_connection(user1) + user_name = conn.getUser().getName() + django_client = self.new_django_client(user_name, user_name) + version = api_settings.API_VERSIONS[-1] + screen = screen_plates[0] + plate_count = len(screen.linkedPlateList()) + screen_url = reverse('api_screen', + kwargs={'api_version': version, + 'object_id': screen.id.val}) + save_url = reverse('api_save', kwargs={'api_version': version}) + # Get Screen, update and save back + rsp = _get_response_json(django_client, screen_url, {}) + screen_json = rsp['data'] + screen_json['Name'] = 'renamed Screen' + _csrf_put_json(django_client, save_url, screen_json) + + # Check screen has been updated and still has child Datasets + scr = conn.getObject('Screen', screen.id.val) + assert scr.getName() == 'renamed Screen' + assert len(list(scr.listChildren())) == plate_count + def test_spw_urls(self, user1, screen_plates): """Test browsing via urls in json /api/->SPW.""" conn = get_connection(user1) diff --git a/components/tools/OmeroWeb/test/integration/test_api_projects.py b/components/tools/OmeroWeb/test/integration/test_api_projects.py index aec7330d9b9..696f12cbbb9 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_projects.py +++ b/components/tools/OmeroWeb/test/integration/test_api_projects.py @@ -600,7 +600,7 @@ def test_project_update(self, user1): rsp = _get_response_json(django_client, project_url, {}) assert rsp['data']['Description'] == 'New test description update' - def test_project_datasets_update(self, user1): + def test_project_datasets_update(self, user1, project_hierarchy_user1_group1): """ Test updating a Project without losing child Datasets. @@ -611,12 +611,10 @@ def test_project_datasets_update(self, user1): user_name = conn.getUser().getName() django_client = self.new_django_client(user_name, user_name) - project = ProjectI() - project.name = rstring('test_project_datasets_update') - dataset = DatasetI() - dataset.name = rstring('Dataset') - project.linkDataset(dataset) - project = get_update_service(user1).saveAndReturnObject(project) + project = project_hierarchy_user1_group1[0] + dataset_count = len(project.linkedDatasetList()) + dataset = project.linkedDatasetList()[0] + image_count = len(dataset.linkedImageList()) version = api_settings.API_VERSIONS[-1] project_url = reverse('api_project', @@ -632,7 +630,21 @@ def test_project_datasets_update(self, user1): # Check Project has been updated and still has child Datasets proj = conn.getObject('Project', project.id.val) assert proj.getName() == 'renamed Project' - assert len(list(proj.listChildren())) == 1 + assert len(list(proj.listChildren())) == dataset_count + + # Get Dataset, update and save back + dataset_url = reverse('api_dataset', + kwargs={'api_version': version, + 'object_id': dataset.id.val}) + rsp = _get_response_json(django_client, dataset_url, {}) + dataset_json = rsp['data'] + dataset_json['Name'] = 'renamed Dataset' + _csrf_put_json(django_client, save_url, dataset_json) + + # Check Dataset has been updated and still has child Images + dataset = conn.getObject('Dataset', dataset.id.val) + assert dataset.getName() == 'renamed Dataset' + assert len(list(dataset.listChildren())) == image_count def test_project_tags_update(self, user1): """ From 5b3bc6c77a0adb9cf19266f40bcbc5c002dd2ce6 Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 1 Mar 2017 13:51:01 +0000 Subject: [PATCH 07/11] Don't unlink children on save of Dataset or Screen --- components/tools/OmeroWeb/omeroweb/api/views.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/tools/OmeroWeb/omeroweb/api/views.py b/components/tools/OmeroWeb/omeroweb/api/views.py index 3acbb9194fd..8408b1e5da1 100644 --- a/components/tools/OmeroWeb/omeroweb/api/views.py +++ b/components/tools/OmeroWeb/omeroweb/api/views.py @@ -700,9 +700,14 @@ def _save_object(self, request, conn, object_json, **kwargs): # Therefore we ignore any details for now: obj.unloadDetails() - # For now, we don't try to save Project's linked Datasets + # Unlink children for Projects, Datasets and Screens to avoid + # breaking links. See PR #4930 if hasattr(obj, 'unloadDatasetLinks'): obj.unloadDatasetLinks() + if hasattr(obj, 'unloadImageLinks'): + obj.unloadImageLinks() + if hasattr(obj, 'unloadPlateLinks'): + obj.unloadPlateLinks() conn.SERVICE_OPTS.setOmeroGroup(group) obj = conn.getUpdateService().saveAndReturnObject(obj, From 3305099de8102e2fa675ec58d9e713574b3bd758 Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 1 Mar 2017 23:47:54 +0000 Subject: [PATCH 08/11] flake8 fix --- .../tools/OmeroWeb/test/integration/test_api_projects.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/tools/OmeroWeb/test/integration/test_api_projects.py b/components/tools/OmeroWeb/test/integration/test_api_projects.py index 696f12cbbb9..b8a19bc30ef 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_projects.py +++ b/components/tools/OmeroWeb/test/integration/test_api_projects.py @@ -600,7 +600,8 @@ def test_project_update(self, user1): rsp = _get_response_json(django_client, project_url, {}) assert rsp['data']['Description'] == 'New test description update' - def test_project_datasets_update(self, user1, project_hierarchy_user1_group1): + def test_project_datasets_update(self, user1, + project_hierarchy_user1_group1): """ Test updating a Project without losing child Datasets. From 571724dffad69d72d61e8a6ba2bee8a8474ba4d5 Mon Sep 17 00:00:00 2001 From: William Moore Date: Mon, 6 Mar 2017 15:43:24 +0000 Subject: [PATCH 09/11] Various updates to api tests from PR #4930 --- .../test/integration/test_api_containers.py | 40 +++++++- .../test/integration/test_api_projects.py | 91 +++++-------------- 2 files changed, 63 insertions(+), 68 deletions(-) diff --git a/components/tools/OmeroWeb/test/integration/test_api_containers.py b/components/tools/OmeroWeb/test/integration/test_api_containers.py index ea727ad4c20..090e4b0884a 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_containers.py +++ b/components/tools/OmeroWeb/test/integration/test_api_containers.py @@ -32,6 +32,7 @@ PlateI, \ ProjectI, \ ScreenI, \ + TagAnnotationI, \ WellI, \ WellSampleI from omero.rtypes import rstring, rint @@ -428,11 +429,48 @@ def test_screen_plates_update(self, user1, screen_plates): screen_json['Name'] = 'renamed Screen' _csrf_put_json(django_client, save_url, screen_json) - # Check screen has been updated and still has child Datasets + # Check Screen has been updated and still has child Plates scr = conn.getObject('Screen', screen.id.val) assert scr.getName() == 'renamed Screen' assert len(list(scr.listChildren())) == plate_count + @pytest.mark.parametrize("dtype", [('project', ProjectI), + ('dataset', DatasetI), + ('screen', ScreenI)]) + def test_container_tags_update(self, user1, dtype): + """ + Test updating a Object without losing linked Tags. + + If we load a Object without loading Annotations, then update + and save the Object, we don't want to lose Annotation links + """ + conn = get_connection(user1) + user_name = conn.getUser().getName() + django_client = self.new_django_client(user_name, user_name) + + container = dtype[1]() + container.name = rstring('test_container_tags_update') + tag = TagAnnotationI() + tag.textValue = rstring('tag') + container.linkAnnotation(tag) + container = get_update_service(user1).saveAndReturnObject(container) + + version = api_settings.API_VERSIONS[-1] + object_url = reverse('api_%s' % dtype[0], + kwargs={'api_version': version, + 'object_id': container.id.val}) + save_url = reverse('api_save', kwargs={'api_version': version}) + # Get container, update and save back + rsp = _get_response_json(django_client, object_url, {}) + object_json = rsp['data'] + object_json['Name'] = 'renamed container' + _csrf_put_json(django_client, save_url, object_json) + + # Check container has been updated and still has annotation links + proj = conn.getObject(dtype[0], container.id.val) + assert proj.getName() == 'renamed container' + assert len(list(proj.listAnnotations())) == 1 + def test_spw_urls(self, user1, screen_plates): """Test browsing via urls in json /api/->SPW.""" conn = get_connection(user1) diff --git a/components/tools/OmeroWeb/test/integration/test_api_projects.py b/components/tools/OmeroWeb/test/integration/test_api_projects.py index b8a19bc30ef..42434542aa6 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_projects.py +++ b/components/tools/OmeroWeb/test/integration/test_api_projects.py @@ -28,7 +28,7 @@ from django.test import Client import pytest from omero.gateway import BlitzGateway -from omero.model import ProjectI, DatasetI, TagAnnotationI +from omero.model import DatasetI, ProjectI, TagAnnotationI from omero.rtypes import unwrap, rstring from omero_marshal import get_encoder, OME_SCHEMA_URL @@ -600,7 +600,8 @@ def test_project_update(self, user1): rsp = _get_response_json(django_client, project_url, {}) assert rsp['data']['Description'] == 'New test description update' - def test_project_datasets_update(self, user1, + @pytest.mark.parametrize("dtype", ['Project', 'Dataset']) + def test_project_datasets_update(self, user1, dtype, project_hierarchy_user1_group1): """ Test updating a Project without losing child Datasets. @@ -612,74 +613,30 @@ def test_project_datasets_update(self, user1, user_name = conn.getUser().getName() django_client = self.new_django_client(user_name, user_name) - project = project_hierarchy_user1_group1[0] - dataset_count = len(project.linkedDatasetList()) - dataset = project.linkedDatasetList()[0] - image_count = len(dataset.linkedImageList()) + if dtype == 'Project': + parent = project_hierarchy_user1_group1[0] + child_count = len(parent.linkedDatasetList()) + url_name = 'api_project' + else: + parent = project_hierarchy_user1_group1[0].linkedDatasetList()[0] + child_count = len(parent.linkedImageList()) + url_name = 'api_dataset' version = api_settings.API_VERSIONS[-1] - project_url = reverse('api_project', - kwargs={'api_version': version, - 'object_id': project.id.val}) - save_url = reverse('api_save', kwargs={'api_version': version}) - # Get Project, update and save back - rsp = _get_response_json(django_client, project_url, {}) - project_json = rsp['data'] - project_json['Name'] = 'renamed Project' - _csrf_put_json(django_client, save_url, project_json) - - # Check Project has been updated and still has child Datasets - proj = conn.getObject('Project', project.id.val) - assert proj.getName() == 'renamed Project' - assert len(list(proj.listChildren())) == dataset_count - - # Get Dataset, update and save back - dataset_url = reverse('api_dataset', - kwargs={'api_version': version, - 'object_id': dataset.id.val}) - rsp = _get_response_json(django_client, dataset_url, {}) - dataset_json = rsp['data'] - dataset_json['Name'] = 'renamed Dataset' - _csrf_put_json(django_client, save_url, dataset_json) - - # Check Dataset has been updated and still has child Images - dataset = conn.getObject('Dataset', dataset.id.val) - assert dataset.getName() == 'renamed Dataset' - assert len(list(dataset.listChildren())) == image_count - - def test_project_tags_update(self, user1): - """ - Test updating a Project without losing linked Tags. - - If we load a Project without loading Annotations, then update - and save the Project, we don't want to lose Annotation links - """ - conn = get_connection(user1) - user_name = conn.getUser().getName() - django_client = self.new_django_client(user_name, user_name) - - project = ProjectI() - project.name = rstring('test_project_tags_update') - tag = TagAnnotationI() - tag.textValue = rstring('tag') - project.linkAnnotation(tag) - project = get_update_service(user1).saveAndReturnObject(project) - - version = api_settings.API_VERSIONS[-1] - project_url = reverse('api_project', - kwargs={'api_version': version, - 'object_id': project.id.val}) + parent_url = reverse(url_name, + kwargs={'api_version': version, + 'object_id': parent.id.val}) save_url = reverse('api_save', kwargs={'api_version': version}) - # Get Project, update and save back - rsp = _get_response_json(django_client, project_url, {}) - project_json = rsp['data'] - project_json['Name'] = 'renamed Project' - _csrf_put_json(django_client, save_url, project_json) - - # Check Project has been updated and still has annotation links - proj = conn.getObject('Project', project.id.val) - assert proj.getName() == 'renamed Project' - assert len(list(proj.listAnnotations())) == 1 + # Get Parent, update and save back + rsp = _get_response_json(django_client, parent_url, {}) + parent_json = rsp['data'] + parent_json['Name'] = 'renamed %s' % dtype + _csrf_put_json(django_client, save_url, parent_json) + + # Check Parent has been updated and still has children linked + parentWrapper = conn.getObject(dtype, parent.id.val) + assert parentWrapper.getName() == 'renamed %s' % dtype + assert len(list(parentWrapper.listChildren())) == child_count def test_project_delete(self, user1): conn = get_connection(user1) From 4352b3a32cd5a5ea022a66582abe3157113a9ce9 Mon Sep 17 00:00:00 2001 From: William Moore Date: Mon, 6 Mar 2017 16:15:54 +0000 Subject: [PATCH 10/11] flake8 fixes --- .../tools/OmeroWeb/test/integration/test_api_containers.py | 4 ++-- .../tools/OmeroWeb/test/integration/test_api_projects.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/tools/OmeroWeb/test/integration/test_api_containers.py b/components/tools/OmeroWeb/test/integration/test_api_containers.py index 090e4b0884a..b9ea9cc3228 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_containers.py +++ b/components/tools/OmeroWeb/test/integration/test_api_containers.py @@ -457,8 +457,8 @@ def test_container_tags_update(self, user1, dtype): version = api_settings.API_VERSIONS[-1] object_url = reverse('api_%s' % dtype[0], - kwargs={'api_version': version, - 'object_id': container.id.val}) + kwargs={'api_version': version, + 'object_id': container.id.val}) save_url = reverse('api_save', kwargs={'api_version': version}) # Get container, update and save back rsp = _get_response_json(django_client, object_url, {}) diff --git a/components/tools/OmeroWeb/test/integration/test_api_projects.py b/components/tools/OmeroWeb/test/integration/test_api_projects.py index 42434542aa6..c15d2607ea0 100644 --- a/components/tools/OmeroWeb/test/integration/test_api_projects.py +++ b/components/tools/OmeroWeb/test/integration/test_api_projects.py @@ -28,7 +28,7 @@ from django.test import Client import pytest from omero.gateway import BlitzGateway -from omero.model import DatasetI, ProjectI, TagAnnotationI +from omero.model import DatasetI, ProjectI from omero.rtypes import unwrap, rstring from omero_marshal import get_encoder, OME_SCHEMA_URL From 240ef765bb1d23488a353e7076d20017c58a2135 Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 8 Mar 2017 14:51:47 +0000 Subject: [PATCH 11/11] Add TODO flag to comment --- components/tools/OmeroWeb/omeroweb/api/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/tools/OmeroWeb/omeroweb/api/views.py b/components/tools/OmeroWeb/omeroweb/api/views.py index 8408b1e5da1..3c986dfdc7d 100644 --- a/components/tools/OmeroWeb/omeroweb/api/views.py +++ b/components/tools/OmeroWeb/omeroweb/api/views.py @@ -700,7 +700,7 @@ def _save_object(self, request, conn, object_json, **kwargs): # Therefore we ignore any details for now: obj.unloadDetails() - # Unlink children for Projects, Datasets and Screens to avoid + # TODO: Unlink children for Projects, Datasets and Screens to avoid # breaking links. See PR #4930 if hasattr(obj, 'unloadDatasetLinks'): obj.unloadDatasetLinks()