From f60fc1cd69db3fd9299c60476f2e2df889beeb6a Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sun, 4 Nov 2018 18:01:07 +0200 Subject: [PATCH] fix(webpack): fix html templates url --- .../components/container-quick-actions/containerQuickActions.js | 2 +- app/docker/components/log-viewer/logViewerController.js | 1 + app/docker/views/containers/logs/containerLogsController.js | 1 + app/docker/views/services/logs/serviceLogsController.js | 1 + app/docker/views/tasks/logs/taskLogsController.js | 1 + .../information-panel-offline/informationPanelOffline.js | 2 +- app/portainer/interceptors/endpointStatusInterceptor.js | 2 ++ app/portainer/services/endpointProvider.js | 1 + 8 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/docker/components/container-quick-actions/containerQuickActions.js b/app/docker/components/container-quick-actions/containerQuickActions.js index 3fb616d7c..619cf7efa 100644 --- a/app/docker/components/container-quick-actions/containerQuickActions.js +++ b/app/docker/components/container-quick-actions/containerQuickActions.js @@ -1,5 +1,5 @@ angular.module('portainer.docker').component('containerQuickActions', { - templateUrl: 'app/docker/components/container-quick-actions/containerQuickActions.html', + templateUrl: './containerQuickActions.html', bindings: { containerId: '<', nodeName: '<', diff --git a/app/docker/components/log-viewer/logViewerController.js b/app/docker/components/log-viewer/logViewerController.js index 9b3f4e82d..9f851fc0c 100644 --- a/app/docker/components/log-viewer/logViewerController.js +++ b/app/docker/components/log-viewer/logViewerController.js @@ -1,4 +1,5 @@ import angular from 'angular'; +import moment from 'moment'; angular.module('portainer.docker') .controller('LogViewerController', ['clipboard', diff --git a/app/docker/views/containers/logs/containerLogsController.js b/app/docker/views/containers/logs/containerLogsController.js index 959cb9f93..39c63af89 100644 --- a/app/docker/views/containers/logs/containerLogsController.js +++ b/app/docker/views/containers/logs/containerLogsController.js @@ -1,4 +1,5 @@ import angular from 'angular'; +import moment from 'moment'; angular.module('portainer.docker') .controller('ContainerLogsController', ['$scope', '$transition$', '$interval', 'ContainerService', 'Notifications', 'HttpRequestHelper', diff --git a/app/docker/views/services/logs/serviceLogsController.js b/app/docker/views/services/logs/serviceLogsController.js index 48e8c17f1..1e22162b9 100644 --- a/app/docker/views/services/logs/serviceLogsController.js +++ b/app/docker/views/services/logs/serviceLogsController.js @@ -1,4 +1,5 @@ import angular from 'angular'; +import moment from 'moment'; angular.module('portainer.docker') .controller('ServiceLogsController', ['$scope', '$transition$', '$interval', 'ServiceService', 'Notifications', diff --git a/app/docker/views/tasks/logs/taskLogsController.js b/app/docker/views/tasks/logs/taskLogsController.js index bc3bae165..c47be226c 100644 --- a/app/docker/views/tasks/logs/taskLogsController.js +++ b/app/docker/views/tasks/logs/taskLogsController.js @@ -1,4 +1,5 @@ import angular from 'angular'; +import moment from 'moment'; angular.module('portainer.docker') .controller('TaskLogsController', ['$scope', '$transition$', '$interval', 'TaskService', 'ServiceService', 'Notifications', diff --git a/app/portainer/components/information-panel-offline/informationPanelOffline.js b/app/portainer/components/information-panel-offline/informationPanelOffline.js index c3f6e9517..6aea67017 100644 --- a/app/portainer/components/information-panel-offline/informationPanelOffline.js +++ b/app/portainer/components/information-panel-offline/informationPanelOffline.js @@ -1,4 +1,4 @@ angular.module('portainer.app').component('informationPanelOffline', { - templateUrl: 'app/portainer/components/information-panel-offline/informationPanelOffline.html', + templateUrl: './informationPanelOffline.html', transclude: true }); diff --git a/app/portainer/interceptors/endpointStatusInterceptor.js b/app/portainer/interceptors/endpointStatusInterceptor.js index 46ca7a42b..25987b478 100644 --- a/app/portainer/interceptors/endpointStatusInterceptor.js +++ b/app/portainer/interceptors/endpointStatusInterceptor.js @@ -1,3 +1,5 @@ +import _ from 'lodash'; + angular.module('portainer.app') .factory('EndpointStatusInterceptor', ['$q', '$injector', 'EndpointProvider', function ($q, $injector, EndpointProvider) { 'use strict'; diff --git a/app/portainer/services/endpointProvider.js b/app/portainer/services/endpointProvider.js index 1a86a7f4a..4984c9f50 100644 --- a/app/portainer/services/endpointProvider.js +++ b/app/portainer/services/endpointProvider.js @@ -1,4 +1,5 @@ import angular from 'angular'; +import _ from 'lodash'; angular.module('portainer.app') .factory('EndpointProvider', ['LocalStorage', function EndpointProviderFactory(LocalStorage) {