External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-08-03 11:30:00 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1352 from ansible/network_ui_3_3

Browse Source 
Graphical UI for Network Inventory
This commit is contained in:
Matthew Jones
2018-03-26 08:11:21 -07:00
committed by GitHub
parent ac70945071 cafc62bd20
commit bddb288ac1
154 changed files with 11166 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/middleware.py
View File

@@ -178,7 +178,7 @@ class URLModificationMiddleware(object):
return '/'.join(url_units)
def process_request(self, request):
if 'REQUEST_URI' in request.environ:
if hasattr(request, 'environ') and 'REQUEST_URI' in request.environ:
old_path = six.moves.urllib.parse.urlsplit(request.environ['REQUEST_URI']).path
old_path = old_path[request.path.find(request.path_info):]
else:

4
awx/main/routing.py
View File

@@ -1,4 +1,5 @@
from channels.routing import route
from awx.network_ui.routing import channel_routing as network_ui_routing
channel_routing = [
@@ -6,3 +7,6 @@ channel_routing = [
route("websocket.disconnect", "awx.main.consumers.ws_disconnect", path=r'^/websocket/$'),
route("websocket.receive", "awx.main.consumers.ws_receive", path=r'^/websocket/$'),
]
channel_routing += network_ui_routing