mirror of https://github.com/portainer/portainer
feat(networks): prevent removal of predefined networks (#2697)
* fix(networks): disable removing predefined networks (#1838) * fix(networks): disable select all for predefined networks (#1838) * fix(networks): do not allow delete in network-details & use constant (#1838)pull/2745/head
parent
c152d3f62e
commit
9cbf1f34a7
|
@ -20,4 +20,5 @@ angular.module('portainer')
|
||||||
.constant('DEFAULT_TEMPLATES_URL', 'https://raw.githubusercontent.com/portainer/templates/master/templates.json')
|
.constant('DEFAULT_TEMPLATES_URL', 'https://raw.githubusercontent.com/portainer/templates/master/templates.json')
|
||||||
.constant('PAGINATION_MAX_ITEMS', 10)
|
.constant('PAGINATION_MAX_ITEMS', 10)
|
||||||
.constant('APPLICATION_CACHE_VALIDITY', 3600)
|
.constant('APPLICATION_CACHE_VALIDITY', 3600)
|
||||||
.constant('CONSOLE_COMMANDS_LABEL_PREFIX', 'io.portainer.commands.');
|
.constant('CONSOLE_COMMANDS_LABEL_PREFIX', 'io.portainer.commands.')
|
||||||
|
.constant('PREDEFINED_NETWORKS', ['host', 'bridge', 'none']);
|
||||||
|
|
|
@ -110,7 +110,7 @@
|
||||||
<tr dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))" ng-class="{active: item.Checked}">
|
<tr dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))" ng-class="{active: item.Checked}">
|
||||||
<td>
|
<td>
|
||||||
<span class="md-checkbox" ng-if="!$ctrl.offlineMode">
|
<span class="md-checkbox" ng-if="!$ctrl.offlineMode">
|
||||||
<input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-change="$ctrl.selectItem(item)"/>
|
<input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-change="$ctrl.selectItem(item)" ng-disabled="$ctrl.disableRemove(item)"/>
|
||||||
<label for="select_{{ $index }}"></label>
|
<label for="select_{{ $index }}"></label>
|
||||||
</span>
|
</span>
|
||||||
<a ng-if="!$ctrl.offlineMode" ui-sref="docker.networks.network({ id: item.Id, nodeName: item.NodeName })" title="{{ item.Name }}">{{ item.Name | truncate:40 }}</a>
|
<a ng-if="!$ctrl.offlineMode" ui-sref="docker.networks.network({ id: item.Id, nodeName: item.NodeName })" title="{{ item.Name }}">{{ item.Name | truncate:40 }}</a>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
angular.module('portainer.docker').component('networksDatatable', {
|
angular.module('portainer.docker').component('networksDatatable', {
|
||||||
templateUrl: 'app/docker/components/datatables/networks-datatable/networksDatatable.html',
|
templateUrl: 'app/docker/components/datatables/networks-datatable/networksDatatable.html',
|
||||||
controller: 'GenericDatatableController',
|
controller: 'NetworksDatatableController',
|
||||||
bindings: {
|
bindings: {
|
||||||
titleText: '@',
|
titleText: '@',
|
||||||
titleIcon: '@',
|
titleIcon: '@',
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
angular.module('portainer.docker')
|
||||||
|
.controller('NetworksDatatableController', ['$scope', '$controller', 'PREDEFINED_NETWORKS',
|
||||||
|
function ($scope, $controller, PREDEFINED_NETWORKS) {
|
||||||
|
angular.extend(this, $controller('GenericDatatableController', {$scope: $scope}));
|
||||||
|
|
||||||
|
this.disableRemove = function(item) {
|
||||||
|
return PREDEFINED_NETWORKS.includes(item.Name);
|
||||||
|
};
|
||||||
|
|
||||||
|
this.selectAll = function() {
|
||||||
|
for (var i = 0; i < this.state.filteredDataSet.length; i++) {
|
||||||
|
var item = this.state.filteredDataSet[i];
|
||||||
|
if (!this.disableRemove(item) && item.Checked !== this.state.selectAll) {
|
||||||
|
item.Checked = this.state.selectAll;
|
||||||
|
this.selectItem(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
]);
|
|
@ -20,7 +20,7 @@
|
||||||
<td>ID</td>
|
<td>ID</td>
|
||||||
<td>
|
<td>
|
||||||
{{ network.Id }}
|
{{ network.Id }}
|
||||||
<button class="btn btn-xs btn-danger" ng-click="removeNetwork(network.Id)"><i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Delete this network</button>
|
<button ng-if="allowRemove(network)" class="btn btn-xs btn-danger" ng-click="removeNetwork(network.Id)"><i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Delete this network</button>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
angular.module('portainer.docker')
|
angular.module('portainer.docker')
|
||||||
.controller('NetworkController', ['$scope', '$state', '$transition$', '$filter', 'NetworkService', 'Container', 'Notifications', 'HttpRequestHelper',
|
.controller('NetworkController', ['$scope', '$state', '$transition$', '$filter', 'NetworkService', 'Container', 'Notifications', 'HttpRequestHelper', 'PREDEFINED_NETWORKS',
|
||||||
function ($scope, $state, $transition$, $filter, NetworkService, Container, Notifications, HttpRequestHelper) {
|
function ($scope, $state, $transition$, $filter, NetworkService, Container, Notifications, HttpRequestHelper, PREDEFINED_NETWORKS) {
|
||||||
|
|
||||||
$scope.removeNetwork = function removeNetwork() {
|
$scope.removeNetwork = function removeNetwork() {
|
||||||
NetworkService.remove($transition$.params().id, $transition$.params().id)
|
NetworkService.remove($transition$.params().id, $transition$.params().id)
|
||||||
|
@ -25,6 +25,10 @@ function ($scope, $state, $transition$, $filter, NetworkService, Container, Noti
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$scope.allowRemove = function allowRemove(item) {
|
||||||
|
return !PREDEFINED_NETWORKS.includes(item.Name);
|
||||||
|
};
|
||||||
|
|
||||||
function filterContainersInNetwork(network, containers) {
|
function filterContainersInNetwork(network, containers) {
|
||||||
var containersInNetwork = [];
|
var containersInNetwork = [];
|
||||||
containers.forEach(function(container) {
|
containers.forEach(function(container) {
|
||||||
|
|
Loading…
Reference in New Issue