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

style: rename variables in code to match UI naming

pull/3511/head
Kirill K 2020-01-21 04:41:22 +03:00
parent b91dd6c83f
commit 5bbe9cc52e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,8 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
MacAddress: '', MacAddress: '',
IPv4: '', IPv4: '',
IPv6: '', IPv6: '',
Dns1: '', DnsPrimary: '',
Dns2: '', DnsSecondary: '',
AccessControlData: new AccessControlFormData(), AccessControlData: new AccessControlFormData(),
CpuLimit: 0, CpuLimit: 0,
MemoryLimit: 0, MemoryLimit: 0,
@ -218,11 +218,11 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
} }
var dnsServers = []; var dnsServers = [];
if ($scope.formValues.Dns1) { if ($scope.formValues.DnsPrimary) {
dnsServers.push($scope.formValues.Dns1); dnsServers.push($scope.formValues.DnsPrimary);
} }
if ($scope.formValues.Dns2) { if ($scope.formValues.DnsSecondary) {
dnsServers.push($scope.formValues.Dns2); dnsServers.push($scope.formValues.DnsSecondary);
} }
config.HostConfig.Dns = dnsServers; config.HostConfig.Dns = dnsServers;
@ -398,8 +398,8 @@ function ($q, $scope, $async, $state, $timeout, $transition$, $filter, Container
} }
$scope.formValues.MacAddress = d.Config.MacAddress; $scope.formValues.MacAddress = d.Config.MacAddress;
$scope.formValues.Dns1 = d.HostConfig.Dns[0]; $scope.formValues.DnsPrimary = d.HostConfig.Dns[0];
$scope.formValues.Dns2 = d.HostConfig.Dns[1]; $scope.formValues.DnsSecondary = d.HostConfig.Dns[1];
// ExtraHosts // ExtraHosts
if ($scope.config.HostConfig.ExtraHosts) { if ($scope.config.HostConfig.ExtraHosts) {

16
app/docker/views/containers/create/createcontainer.html
View File

@ -435,22 +435,22 @@
</div> </div>
</div> </div>
<!-- !ipv6-input --> <!-- !ipv6-input -->
<!-- dns1-input --> <!-- dns-primary-input -->
<div class="form-group"> <div class="form-group">
<label for="container_dns1" class="col-sm-2 col-lg-1 control-label text-left">Primary DNS Server</label> <label for="container_dns_primary" class="col-sm-2 col-lg-1 control-label text-left">Primary DNS Server</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input type="text" class="form-control" ng-model="formValues.Dns1" id="container_dns1" placeholder="e.g. 1.1.1.1"> <input type="text" class="form-control" ng-model="formValues.DnsPrimary" id="container_dns_primary" placeholder="e.g. 1.1.1.1">
</div> </div>
</div> </div>
<!-- !dns1-input --> <!-- !dns-primary-input -->
<!-- dns2-input --> <!-- dns-secondary-input -->
<div class="form-group"> <div class="form-group">
<label for="container_dns2" class="col-sm-2 col-lg-1 control-label text-left">Secondary DNS Server</label> <label for="container_dns_secondary" class="col-sm-2 col-lg-1 control-label text-left">Secondary DNS Server</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input type="text" class="form-control" ng-model="formValues.Dns2" id="container_dns2" placeholder="e.g. 8.8.8.8"> <input type="text" class="form-control" ng-model="formValues.DnsSecondary" id="container_dns_secondary" placeholder="e.g. 8.8.8.8">
</div> </div>
</div> </div>
<!-- !dns2-input --> <!-- !dns-secondary-input -->
<!-- extra-hosts-variables --> <!-- extra-hosts-variables -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-12" style="margin-top: 5px;"> <div class="col-sm-12" style="margin-top: 5px;">