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

Fixed parent container of activity stream setting the min-height value. This keeps the activity stream from overlapping the footer. Fixed groups page edit to not clear/empty the credential_name field.

Browse Source
This commit is contained in:
Chris Houseknecht
2013-11-08 22:07:51 +00:00
parent b2ce037acc
commit 5b2751c57f
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/js/helpers/Groups.js
View File

@@ -674,10 +674,10 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
.factory('GroupsEdit', ['$rootScope', '$location', '$log', '$routeParams', 'Rest', 'Alert', 'GroupForm', 'GenerateForm', .factory('GroupsEdit', ['$rootScope', '$location', '$log', '$routeParams', 'Rest', 'Alert', 'GroupForm', 'GenerateForm',
'Prompt', 'ProcessErrors', 'GetBasePath', 'SetNodeName', 'ParseTypeChange', 'GetSourceTypeOptions', 'InventoryUpdate', 'Prompt', 'ProcessErrors', 'GetBasePath', 'SetNodeName', 'ParseTypeChange', 'GetSourceTypeOptions', 'InventoryUpdate',
'GetUpdateIntervalOptions', 'ClickNode', 'LookUpInit', 'CredentialList', 'GetUpdateIntervalOptions', 'ClickNode', 'LookUpInit', 'CredentialList', 'Empty',
function($rootScope, $location, $log, $routeParams, Rest, Alert, GroupForm, GenerateForm, Prompt, ProcessErrors, function($rootScope, $location, $log, $routeParams, Rest, Alert, GroupForm, GenerateForm, Prompt, ProcessErrors,
GetBasePath, SetNodeName, ParseTypeChange, GetSourceTypeOptions, InventoryUpdate, GetUpdateIntervalOptions, ClickNode, GetBasePath, SetNodeName, ParseTypeChange, GetSourceTypeOptions, InventoryUpdate, GetUpdateIntervalOptions, ClickNode,
LookUpInit, CredentialList) { LookUpInit, CredentialList, Empty) {
return function(params) { return function(params) {
var group_id = params.group_id; var group_id = params.group_id;
@@ -996,8 +996,6 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
// reset fields // reset fields
scope.source_path = ''; scope.source_path = '';
scope[form.name + '_form']['source_path'].$setValidity('required',true); scope[form.name + '_form']['source_path'].$setValidity('required',true);
scope['credential'] = '';
scope['credential_name'] = '';
} }
LookUpInit({ LookUpInit({
url: GetBasePath('credentials') + url: GetBasePath('credentials') +

2
awx/ui/static/js/helpers/Lookup.js
View File

@@ -126,6 +126,8 @@ angular.module('LookUpHelper', [ 'RestServices', 'Utilities', 'SearchHelper', 'P
if (listScope[list.name][i][form.fields[field].sourceField] == if (listScope[list.name][i][form.fields[field].sourceField] ==
scope[form.fields[field].sourceModel + '_' + form.fields[field].sourceField]) { scope[form.fields[field].sourceModel + '_' + form.fields[field].sourceField]) {
scope[field] = listScope[list.name][i].id; scope[field] = listScope[list.name][i].id;
//scope[form.fields[field].sourceModel + '_' + form.fields[field].sourceField] =
// listScope[list.name][i][form.fields[field].sourceField];
break; break;
} }
} }

12
awx/ui/static/js/widgets/Stream.js
View File

@@ -13,16 +13,25 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
.factory('ShowStream', [ function() { .factory('ShowStream', [ function() {
return function() { return function() {
// Slide in the Stream widget // Slide in the Stream widget
// Make some style/position adjustments adjustments
var stream = $('#stream-container'); var stream = $('#stream-container');
stream.css({ stream.css({
position: 'absolute', position: 'absolute',
left: 0,
top: 0, top: 0,
left: 0,
width: '100%', width: '100%',
'min-height': '100%', 'min-height': '100%',
'background-color': '#FFF' 'background-color': '#FFF'
}); });
// Try not to overlap footer. Because stream is positioned absolute, the parent
// doesn't resize correctly when stream is loaded.
$('#tab-content-container').css({ 'min-height': stream.height() });
// Slide in stream
stream.show('slide', {'direction': 'left'}, {'duration': 500, 'queue': false }); stream.show('slide', {'direction': 'left'}, {'duration': 500, 'queue': false });
} }
}]) }])
@@ -40,6 +49,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
stream.detach(); stream.detach();
stream.empty(); stream.empty();
stream.unbind(); stream.unbind();
$('#tab-content-container').css({ 'min-height': 0 }); //let the parent height go back to normal
}, 500); }, 500);
} }
}]) }])