diff --git a/awx/ui/client/src/templates/templates.service.js b/awx/ui/client/src/templates/templates.service.js index 63dfe91590..71ebb17626 100644 --- a/awx/ui/client/src/templates/templates.service.js +++ b/awx/ui/client/src/templates/templates.service.js @@ -133,10 +133,10 @@ export default ['Rest', 'GetBasePath', '$q', 'NextPage', function(Rest, GetBaseP getWorkflowJobTemplateNodes: function(id, page) { var url = GetBasePath('workflow_job_templates'); - url = url + id + '/workflow_nodes'; + url = url + id + '/workflow_nodes?page_size=200'; if(page) { - url += '/?page=' + page; + url += '/&page=' + page; } Rest.setUrl(url); diff --git a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js index 03728c5761..d7d32244f6 100644 --- a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js +++ b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js @@ -832,7 +832,7 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge .attr("height", tipHeight+20) .attr("class", "WorkflowChart-tooltip") .html(function(){ - return "
" + $filter('sanitize')(resourceName) + "
"; + return "
" + $filter('sanitize')(resourceName) + "
"; }); } diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html index ee64faadb9..0732e14819 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html +++ b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html @@ -7,23 +7,23 @@
-
- +
+
-
+
No records matched your search.
-
PLEASE ADD ITEMS TO THIS LIST
+
PLEASE ADD ITEMS TO THIS LIST
- - diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js index 824527bcbb..ab2f33e9af 100644 --- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js +++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js @@ -307,6 +307,10 @@ export default ['$scope', 'TemplatesService', $scope.cancelNodeForm(); } + if ($scope.linkConfig) { + $scope.cancelLinkForm(); + } + $scope.graphState.arrayOfNodesForChart.push({ index: $scope.graphState.arrayOfNodesForChart.length, id: workflowMakerNodeIdCounter, @@ -343,6 +347,10 @@ export default ['$scope', 'TemplatesService', $scope.cancelNodeForm(); } + if ($scope.linkConfig) { + $scope.cancelLinkForm(); + } + $scope.graphState.arrayOfNodesForChart.push({ index: $scope.graphState.arrayOfNodesForChart.length, id: workflowMakerNodeIdCounter, diff --git a/awx/ui/client/src/workflow-results/workflow-results.controller.js b/awx/ui/client/src/workflow-results/workflow-results.controller.js index ca11942937..8f7eef7ae8 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.controller.js +++ b/awx/ui/client/src/workflow-results/workflow-results.controller.js @@ -1,9 +1,9 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions', 'jobLabels', 'workflowNodes', '$scope', 'ParseTypeChange', - 'ParseVariableString', 'count', '$state', 'i18n', 'WorkflowChartService', + 'ParseVariableString', 'count', '$state', 'i18n', 'WorkflowChartService', '$filter', 'moment', function(workflowData, workflowResultsService, workflowDataOptions, jobLabels, workflowNodes, $scope, ParseTypeChange, - ParseVariableString, count, $state, i18n, WorkflowChartService, + ParseVariableString, count, $state, i18n, WorkflowChartService, $filter, moment) { var runTimeElapsedTimer = null; let nodeIdToChartNodeIdMapping = {}; diff --git a/awx/ui/client/src/workflow-results/workflow-results.route.js b/awx/ui/client/src/workflow-results/workflow-results.route.js index 84562c4783..06fbb5f814 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.route.js +++ b/awx/ui/client/src/workflow-results/workflow-results.route.js @@ -49,7 +49,7 @@ export default { // flashing as rest data comes in. Provides the list of workflow nodes workflowNodes: ['workflowData', 'Rest', '$q', function(workflowData, Rest, $q) { var defer = $q.defer(); - Rest.setUrl(workflowData.related.workflow_nodes + '?order_by=id'); + Rest.setUrl(workflowData.related.workflow_nodes + '?order_by=id&page_size=200'); Rest.get() .then(({data}) => { if(data.next) {
+ +