diff --git a/django/applications/catmaid/control/skeletonexport.py b/django/applications/catmaid/control/skeletonexport.py index 76ad4c2cbc..af3e184f84 100644 --- a/django/applications/catmaid/control/skeletonexport.py +++ b/django/applications/catmaid/control/skeletonexport.py @@ -665,9 +665,9 @@ def _compact_skeleton(project_id, skeleton_id, with_connectors=True, if with_connectors or with_tags or with_annotations: # postgres is caching this query cursor.execute(""" - SELECT relation_name, id FROM relation WHERE project_id=%(project_id)s - """, { - 'project_id': project_id, + SELECT relation_name, id FROM relation WHERE project_id=%(project_id)s + """, { + 'project_id': project_id, }) relations = dict(cursor.fetchall()) diff --git a/django/applications/catmaid/control/useranalytics.py b/django/applications/catmaid/control/useranalytics.py index ef0a83c725..cad2eebfbf 100644 --- a/django/applications/catmaid/control/useranalytics.py +++ b/django/applications/catmaid/control/useranalytics.py @@ -172,7 +172,7 @@ def get_useranalytics_data(request:HttpRequest, project_id) -> HttpResponse: data['raw_write_events'] = raw_data['otherwrites_events'] data['net_active_time'] = raw_data['net_active_time'].tolist() data['netactivetime_timeaxis'] = raw_data['netactivetime_timeaxis'] - #data['active_bouts'] = raw_data['active_bouts'].tolist() + # data['active_bouts'] = raw_data['active_bouts'].tolist() return JsonResponse(data) diff --git a/django/applications/catmaid/static/js/widgets/compartment_graph_widget.js b/django/applications/catmaid/static/js/widgets/compartment_graph_widget.js index 96f1347d5b..a44c464ca0 100644 --- a/django/applications/catmaid/static/js/widgets/compartment_graph_widget.js +++ b/django/applications/catmaid/static/js/widgets/compartment_graph_widget.js @@ -4900,7 +4900,7 @@ var is_tgt_axon = node_target.id().endsWith("_axon"); var is_tgt_dendrite = node_target.id().endsWith("_dendrite"); var set = function() { - if (visible) edge.show() + if (visible) edge.show(); else edge.hide(); }; if (is_src_axon) { diff --git a/django/applications/catmaid/tests/test_async.py b/django/applications/catmaid/tests/test_async.py index 1bd6e09161..056fb230f4 100644 --- a/django/applications/catmaid/tests/test_async.py +++ b/django/applications/catmaid/tests/test_async.py @@ -47,9 +47,6 @@ async def test_basic_connection(self): communicator = AuthWebsocketCommunicator(UpdateConsumer.as_asgi(), '/channels/updates', user, headers=headers) - - #communicator = WebsocketCommunicator(UpdateConsumer.as_asgi(), "GET", "/channels/updates") - #communicator.instance.scope["user"] = await get_user(username='temporary') connected, subprotocol = await communicator.connect() assert connected diff --git a/setup.cfg b/setup.cfg index 2c84121b49..b775138864 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,6 +45,8 @@ ignore = E252, #at least two spaces before inline comment E261, + #block comment should start with '# ' + E265, #expected 2 blank lines, found 1 E302, #too many blank lines (2)