External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

fixed modal being open on route change and modal scrolling

Browse Source
This commit is contained in:
John Mitchell
2016-03-10 14:50:42 -05:00
parent 63d91268ea
commit 8f1cdbdbf9
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/legacy-styles/ansible-ui.less
View File

@@ -2066,3 +2066,7 @@ tr td button i {
.select2-container--disabled { .select2-container--disabled {
opacity: .35; opacity: .35;
} }
body.is-modalOpen {
overflow: hidden;
}

2
awx/ui/client/src/access/addPermissions/addPermissions.block.less
View File

@@ -40,8 +40,6 @@
.AddPermissions-body { .AddPermissions-body {
padding: 0px 20px; padding: 0px 20px;
max-height: 70vh;
overflow: scroll;
} }
.AddPermissions-footer { .AddPermissions-footer {

7
awx/ui/client/src/access/addPermissions/addPermissions.directive.js
View File

@@ -18,6 +18,8 @@ export default
link: function(scope, element, attrs, ctrl) { link: function(scope, element, attrs, ctrl) {
scope.toggleFormTabs('users'); scope.toggleFormTabs('users');
$("body").addClass("is-modalOpen");
$("body").append(element); $("body").append(element);
Wait('start'); Wait('start');
@@ -35,6 +37,7 @@ export default
}); });
scope.closeModal = function() { scope.closeModal = function() {
$("body").removeClass("is-modalOpen");
$('#add-permissions-modal').on('hidden.bs.modal', $('#add-permissions-modal').on('hidden.bs.modal',
function () { function () {
$('.AddPermissions').remove(); $('.AddPermissions').remove();
@@ -42,6 +45,10 @@ export default
$('#add-permissions-modal').modal('hide'); $('#add-permissions-modal').modal('hide');
}; };
scope.$on('closePermissionsModal', function() {
scope.closeModal();
});
Wait('stop'); Wait('stop');
window.scrollTo(0,0); window.scrollTo(0,0);

1
awx/ui/client/src/app.js
View File

@@ -1055,6 +1055,7 @@ var tower = angular.module('Tower', [
$rootScope.$on("$stateChangeStart", function (event, next, nextParams, prev) { $rootScope.$on("$stateChangeStart", function (event, next, nextParams, prev) {
$rootScope.$broadcast("closePermissionsModal");
// this line removes the query params attached to a route // this line removes the query params attached to a route
if(prev && prev.$$route && if(prev && prev.$$route &&
prev.$$route.name === 'systemTracking'){ prev.$$route.name === 'systemTracking'){