github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(container-creation): allow empty value for labels (#2655) 

* Allow empty values for labels

* Allow empty labels when creating containers from a template
pull/3397/head
KemoNine 2019-11-24 19:25:30 -05:00 committed by Anthony Lapenna
parent 130c188717
commit a41ca1fd46
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/docker/views/containers/create/createContainerController.js
View File

@ -221,8 +221,13 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
function prepareLabels(config) {
var labels = {};
$scope.formValues.Labels.forEach(function (label) {
if (label.name && label.value) {
labels[label.name] = label.value;
if (label.name) {
if (label.value) {
labels[label.name] = label.value;
}
else {
labels[label.name] = '';
}
}
});
config.Labels = labels;

9
app/portainer/helpers/templateHelper.js
View File

@ -52,8 +52,13 @@ angular.module('portainer.app')
helper.updateContainerConfigurationWithLabels = function(labelsArray) {
var labels = {};
labelsArray.forEach(function (l) {
if (l.name && l.value) {
labels[l.name] = l.value;
if (l.name) {
if (l.value) {
labels[l.name] = l.value;
}
else {
labels[l.name] = '';
}
}
});
return labels;