Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

fix(edge): fix edge views (#4184)

Browse source 
* fix(edge): add ngInject

* feat(edge): init edge job model
This commit is contained in:
Chaim Lev-Ari 2020-08-11 00:51:21 +03:00 • committed by GitHub
parent 134f2f1532
commit c439bc56ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatableController.js
View file

@ -1,6 +1,7 @@
import angular from 'angular';
export class AssociatedEndpointsDatatableController {
/* @ngInject */
constructor($scope, $controller, DatatableService, PaginationService) {
this.extendGenericController($controller, $scope);
this.DatatableService = DatatableService;

6
app/edge/components/edge-job-form/edgeJobFormController.js
View file

@ -33,8 +33,6 @@ export class EdgeJobFormController {
// see https://regexr.com/573i2
this.cronRegex = /(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\d+(ns|us|µs|ms|s|m|h))+)|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ){4,6}((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*))/;
this.onChangeModel(this.model);
this.action = this.action.bind(this);
this.editorUpdate = this.editorUpdate.bind(this);
this.associateEndpoint = this.associateEndpoint.bind(this);
@ -85,6 +83,10 @@ export class EdgeJobFormController {
dissociateEndpoint(endpoint) {
this.model.Endpoints = _.filter(this.model.Endpoints, (id) => id !== endpoint.Id);
}
$onInit() {
this.onChangeModel(this.model);
}
}
function cronToDatetime(cron, defaultTime = moment()) {

1
app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js
View file

@ -1,6 +1,7 @@
import angular from 'angular';
export class EdgeStackEndpointsDatatableController {
/* @ngInject */
constructor($async, $scope, $controller, DatatableService, PaginationService, Notifications) {
this.extendGenericController($controller, $scope);
this.DatatableService = DatatableService;

1
app/edge/components/edit-edge-stack-form/editEdgeStackFormController.js
View file

@ -1,4 +1,5 @@
export class EditEdgeStackFormController {
/* @ngInject */
constructor() {
this.editorUpdate = this.editorUpdate.bind(this);
}

1
app/edge/components/groups-datatable/groupsDatatableController.js
View file

@ -1,6 +1,7 @@
import angular from 'angular';
export class EdgeGroupsDatatableController {
/* @ngInject */
constructor($scope, $controller) {
const allowSelection = this.allowSelection;
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));