Skip to content

Commit

Permalink
Hotfixes/110223 (#1118)
Browse files Browse the repository at this point in the history
* Fix NCO websockets

* Uncomment file nav UI in simulations

* support old-style websocket paths

---------

Co-authored-by: Jake Rosenberg <[email protected]>
  • Loading branch information
jarosenb and Jake Rosenberg authored Nov 3, 2023
1 parent 680bc2a commit 5628588
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion designsafe/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "designsafe.settings")
websocket_urlpatterns = [
re_path(r'ws/websockets/$', DesignsafeWebsocketConsumer.as_asgi()),
re_path(r'ws/websockets/*$', DesignsafeWebsocketConsumer.as_asgi()),
]

application = ProtocolTypeRouter(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ <h3 class="text-center">
>&nbsp;</files-listing>
</div>
</div>
</div>
</div>-->
<div ng-if="$ctrl.ui.fileNav && !$ctrl.ui.loading">
<breadcrumb
path="$ctrl.breadcrumbParams.path"
Expand All @@ -72,7 +72,7 @@ <h3 class="text-center">
listing="$ctrl.FileListingService.listings.main"
on-browse="$ctrl.onBrowse(file)"
>&nbsp;</files-listing>
</div> -->
</div>

<div ng-if="!$ctrl.ui.fileNav && !$ctrl.ui.loading" ng-repeat="simulation in $ctrl.project.simulation_set" style="margin-bottom:20px">
<div class="dropdown dropdown-spacer-sm" id="details-{{simulation.uuid}}">
Expand Down
2 changes: 1 addition & 1 deletion designsafe/static/scripts/nco/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ ncoModule.config([
(window.location.protocol === 'https:' ? 'wss://' : 'ws://') +
window.location.hostname +
(window.location.port ? ':' + window.location.port : '') +
'/ws/websockets?subscribe-broadcast&subscribe-user'
'/ws/websockets/?subscribe-broadcast&subscribe-user'
);
},
]);
Expand Down

0 comments on commit 5628588

Please sign in to comment.