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

Merge pull request #8799 from jakemcdermott/fix-8355-part0

Browse Source 
Place some initial files for migration view

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-12-10 16:31:28 +00:00 committed by GitHub
commit 871b862731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/middleware.py
View File

@ -181,4 +181,4 @@ class MigrationRanCheckMiddleware(MiddlewareMixin):
plan = executor.migration_plan(executor.loader.graph.leaf_nodes()) plan = executor.migration_plan(executor.loader.graph.leaf_nodes())
if bool(plan) and \ if bool(plan) and \
getattr(resolve(request.path), 'url_name', '') != 'migrations_notran': getattr(resolve(request.path), 'url_name', '') != 'migrations_notran':
return redirect(reverse("ui:migrations_notran")) return redirect(reverse("ui_next:migrations_notran"))

25
awx/ui_next/public/installing.html Normal file
View File

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<meta
http-equiv="Content-Security-Policy"
content="default-src 'self'; connect-src 'self' ws: wss:; style-src 'self' 'nonce-{{ csp_nonce }}'; script-src 'self' 'nonce-{{ csp_nonce }}' *.pendo.io; img-src 'self' *.pendo.io data:;"
/>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<script nonce="{{ csp_nonce }}">
setInterval(function() {
window.location = '/';
}, 10000);
</script>
</head>
<body>
<div>
<span>
<p>AWX is installing.</p>
<p>This page will refresh when complete.</p>
</span>
</div>
</body>
</html>

7
awx/ui_next/urls.py
View File

@ -7,9 +7,14 @@ class IndexView(TemplateView):
template_name = 'index.html' template_name = 'index.html'
class MigrationsNotran(TemplateView):
template_name = 'installing.html'
app_name = 'ui_next' app_name = 'ui_next'
urlpatterns = [ urlpatterns = [
url(r'^$', IndexView.as_view(), name='index'), url(r'^$', IndexView.as_view(), name='index'),
#url(r'^migrations_notran/$', migrations_notran, name='migrations_notran'), url(r'^migrations_notran/$', MigrationsNotran.as_view(), name='migrations_notran'),
] ]