From cc8a39e6d92fa7bf31e69343c6bed4d7a57694ea Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 1 May 2015 12:27:40 -0400 Subject: [PATCH] fixed tooltip on popover bug --- awx/ui/static/js/shared/directives.js | 2 +- awx/ui/static/js/shared/generator-helpers.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/static/js/shared/directives.js b/awx/ui/static/js/shared/directives.js index 3cdd42ae61..c55c117813 100644 --- a/awx/ui/static/js/shared/directives.js +++ b/awx/ui/static/js/shared/directives.js @@ -452,7 +452,7 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job .directive('awPopOver', ['$compile', function($compile) { return function(scope, element, attrs) { var placement = (attrs.placement !== undefined && attrs.placement !== null) ? attrs.placement : 'left', - title = (attrs.title) ? attrs.title : (attrs.popoverTitle) ? attrs.popoverTitle : 'Help', + title = (attrs.overTitle) ? attrs.overTitle : (attrs.popoverTitle) ? attrs.popoverTitle : 'Help', container = (attrs.container !== undefined) ? attrs.container : false, trigger = (attrs.trigger !== undefined) ? attrs.trigger : 'manual', template = '', diff --git a/awx/ui/static/js/shared/generator-helpers.js b/awx/ui/static/js/shared/generator-helpers.js index 45f739db1c..5979185474 100644 --- a/awx/ui/static/js/shared/generator-helpers.js +++ b/awx/ui/static/js/shared/generator-helpers.js @@ -46,7 +46,7 @@ angular.module('GeneratorHelpers', [systemStatus.name]) result = "