diff --git a/client/app/custom_modules/custom_modules.component.js b/client/app/custom_modules/custom_modules.component.js index ad01ebd..2847c0c 100644 --- a/client/app/custom_modules/custom_modules.component.js +++ b/client/app/custom_modules/custom_modules.component.js @@ -166,8 +166,7 @@ export class CustomModulesComponent { $scope.result = ""; var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/modals/complex_var_modal/complexVariable.html', + template: require('../../app/modals/complex_var_modal/complexVariable.html'), controller: 'ComplexVarModalController', size: 'sm', backdrop: 'static', diff --git a/client/app/designer/inventory/inventory.component.js b/client/app/designer/inventory/inventory.component.js index 1334ed9..bda9dec 100644 --- a/client/app/designer/inventory/inventory.component.js +++ b/client/app/designer/inventory/inventory.component.js @@ -75,8 +75,7 @@ export class InventoryComponent { $scope.showCreatInventoryModal = function () { var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/inventory/new_inventory/new_inventory.html', + template: require('./new_inventory/new_inventory.html'), controller: 'NewInventoryController', size: 'md', backdrop: 'static', @@ -105,8 +104,7 @@ export class InventoryComponent { $scope.showCreateGroupModal = function (editGroup) { var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/inventory/new_group/new_group.html', + template: require('./new_group/new_group.html'), controller: 'NewGroupController', size: 'lg', backdrop: 'static', @@ -145,8 +143,7 @@ export class InventoryComponent { $scope.showCreateHostModal = function (editHost) { var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/inventory/new_host/new_host.html', + template: require('./new_host/new_host.html'), controller: 'NewHostController', size: 'lg', backdrop: 'static', diff --git a/client/app/designer/playbook/playbook.component.js b/client/app/designer/playbook/playbook.component.js index 0ebd39a..7278958 100644 --- a/client/app/designer/playbook/playbook.component.js +++ b/client/app/designer/playbook/playbook.component.js @@ -86,8 +86,7 @@ export class PlaybookComponent { $scope.showCreatePlaybookModal = function(){ var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/playbook/new_playbook/new_playbook.html', + template: require('./new_playbook/new_playbook.html'), controller: 'NewPlaybookController', size: 'md', backdrop : 'static', @@ -156,8 +155,7 @@ export class PlaybookComponent { $scope.showCreatePlayModal = function(selectedPlayIndex){ var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createPlayContent.html',*/ - templateUrl: 'app/designer/playbook/new_play/new_play.html', + template: require('./new_play/new_play.html'), controller: 'NewPlayController', size: 'lg', backdrop : 'static', @@ -211,11 +209,10 @@ export class PlaybookComponent { // ------------------- EXECUTE PLAYBOOK MODAL ------------- $scope.executeAnsiblePlayBook = function(tags,executionType,executionName,selectedPlay){ - console.log("Tags type" + typeof tags) + var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/execution/executeModal.html', + template: require('../execution/executeModal.html'), controller: 'ExecutionController', size: 'lg', backdrop : 'static', diff --git a/client/app/designer/roles/roles.component.js b/client/app/designer/roles/roles.component.js index f11827f..545138f 100644 --- a/client/app/designer/roles/roles.component.js +++ b/client/app/designer/roles/roles.component.js @@ -196,8 +196,7 @@ export class RolesComponent { $scope.showCreateFileModal = function (selectedFile, copyFile) { var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/roles/new_file/new_file.html', + template: require('./new_file/new_file.html'), controller: 'NewFileController', size: 'md', backdrop: 'static', @@ -230,8 +229,7 @@ export class RolesComponent { $scope.showCreateRoleModal = function (copyRole) { var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/roles/new_role/new_role.html', + template: require('./new_role/new_role.html'), controller: 'NewRoleController', size: 'md', backdrop: 'static', @@ -259,8 +257,7 @@ export class RolesComponent { $scope.showSearchRoleModal = function () { var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/roles/search_role/search_role.html', + template: require('./search_role/search_role.html'), controller: 'SearchRoleController', size: 'lg', backdrop: 'static', @@ -399,17 +396,14 @@ export class RolesComponent { // ------------------- EXECUTE PLAYBOOK MODAL ------------- $scope.executeAnsiblePlayBook = function (tags, executionType, executionName, selectedPlay) { - console.log("Tags type" + typeof tags); var projectRolesFolder = Projects.selectedProject.ansibleEngine.projectFolder + '/roles'; var rolesFolder = projectRolesFolder + '/' + $scope.selectedRole.role; var roleName = $scope.selectedRole.role; - console.log("Projects Roles Folder" + projectRolesFolder); var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/execution/executeModal.html', + template: require('../execution/executeModal.html'), controller: 'ExecutionController', size: 'lg', backdrop: 'static', diff --git a/client/app/designer/tasks/new_task/new_task.controller.js b/client/app/designer/tasks/new_task/new_task.controller.js index 413b34b..048179a 100644 --- a/client/app/designer/tasks/new_task/new_task.controller.js +++ b/client/app/designer/tasks/new_task/new_task.controller.js @@ -414,8 +414,7 @@ export function newTaskController($window, $scope, $sce, $uibModal, ansi2html, a variable.isComplexVariable = true; var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/modals/complex_var_modal/complexVariable.html', + template: require('../../../modals/complex_var_modal/complexVariable.html'), controller: 'ComplexVarModalController', size: 'sm', backdrop: 'static', diff --git a/client/app/designer/tasks/tasks.directive.js b/client/app/designer/tasks/tasks.directive.js index 939b009..e26b666 100644 --- a/client/app/designer/tasks/tasks.directive.js +++ b/client/app/designer/tasks/tasks.directive.js @@ -4,7 +4,7 @@ const angular = require('angular'); export default angular.module('webAppApp.tasks', []) .directive('tasks', function(ansible, $uibModal) { return { - templateUrl: 'app/designer/tasks/tasks.html', + template: require('./tasks.html'), restrict: 'EA', scope: { tasksList: '=', @@ -23,7 +23,6 @@ export default angular.module('webAppApp.tasks', []) scope.tasksMetaData = []; scope.$watch('tasksList',function(){ - console.log('tasks list changed'); scope.tasksMetaData = []; angular.forEach(scope.tasksList,function(task){ @@ -94,8 +93,7 @@ export default angular.module('webAppApp.tasks', []) scope.showTaskModal = function(selectedTaskIndex, copyTask){ var modalInstance = $uibModal.open({ animation: true, - /*templateUrl: 'createTaskContent.html',*/ - templateUrl: 'app/designer/tasks/new_task/new_task.html', + template: require('./new_task/new_task.html'), controller: 'NewTaskController', size: 'lg', backdrop : 'static', diff --git a/client/app/runs/runs.component.js b/client/app/runs/runs.component.js index ac33ccb..56897da 100644 --- a/client/app/runs/runs.component.js +++ b/client/app/runs/runs.component.js @@ -41,7 +41,7 @@ export class RunsComponent { $scope.showLogs = function(runData){ var modalInstance = $uibModal.open({ animation: false, - templateUrl: 'app/designer/execution/executeModal.html', + template: require('../designer/execution/executeModal.html'), controller: 'ExecutionController', size: 'lg', backdrop : 'static',