shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

AC-674 flash message is now cleared whenever AS is summoned.

Browse Source
This commit is contained in:
Chris Houseknecht 2013-11-20 22:37:29 +00:00
parent 8afdb710be
commit ade961fd38
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,8 +164,9 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
} }
}]) }])
.factory('ShowDetail', ['Rest', 'Alert', 'GenerateForm', 'ProcessErrors', 'GetBasePath', 'FormatDate', 'ActivityDetailForm', 'Empty', .factory('ShowDetail', ['$rootScope', 'Rest', 'Alert', 'GenerateForm', 'ProcessErrors', 'GetBasePath', 'FormatDate', 'ActivityDetailForm',
function(Rest, Alert, GenerateForm, ProcessErrors, GetBasePath, FormatDate, ActivityDetailForm, Empty) { 'Empty',
function($rootScope, Rest, Alert, GenerateForm, ProcessErrors, GetBasePath, FormatDate, ActivityDetailForm, Empty) {
return function(activity_id) { return function(activity_id) {
var generator = GenerateForm; var generator = GenerateForm;
@ -180,6 +181,8 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {
// load up the form // load up the form
var results = data; var results = data;
$rootScope.flashMessage = null;
$('#form-modal').on('show.bs.modal', function (e) { $('#form-modal').on('show.bs.modal', function (e) {
$('#form-modal-body').css({ $('#form-modal-body').css({
width:'auto', //probably not needed width:'auto', //probably not needed
@ -246,7 +249,9 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
var defaultUrl = GetBasePath('activity_stream'); var defaultUrl = GetBasePath('activity_stream');
var view = GenerateList; var view = GenerateList;
var base = $location.path().replace(/^\//,'').split('/')[0]; var base = $location.path().replace(/^\//,'').split('/')[0];
$rootScope.flashMessage = null;
if ($location.path() !== '/home') { if ($location.path() !== '/home') {
// Restrict what we're looking at based on the path // Restrict what we're looking at based on the path
var type = (base == 'inventories') ? 'inventory' : base.replace(/s$/,''); var type = (base == 'inventories') ? 'inventory' : base.replace(/s$/,'');