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

Merge branch 'release/2.5' into develop

Browse source
This commit is contained in:
yi-portainer 2021-05-18 17:02:31 +12:00
commit af03d91e39
11 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/docker/components/imageRegistry/por-image-registry.html
View file

@ -1,6 +1,6 @@
<!-- use registry -->
<div ng-if="$ctrl.model.UseRegistry">
<div class="form-group">
<div>
<div class="form-group" ng-if="$ctrl.model.UseRegistry">
<label for="image_registry" class="control-label text-left" ng-class="$ctrl.labelClass">
Registry
</label>

4
app/docker/views/containers/create/createContainerController.js
View file

@ -972,9 +972,7 @@ angular.module('portainer.docker').controller('CreateContainerController', [
}
async function shouldShowSysctls() {
const { allowSysctlSettingForRegularUsers } = $scope.applicationState.application;
return allowSysctlSettingForRegularUsers || Authentication.isAdmin();
return endpoint.SecuritySettings.allowSysctlSettingForRegularUsers || Authentication.isAdmin();
}
async function checkIfContainerCapabilitiesEnabled() {

2
app/docker/views/services/create/createServiceController.js
View file

@ -499,7 +499,7 @@ angular.module('portainer.docker').controller('CreateServiceController', [
const resourceControl = data.Portainer.ResourceControl;
const userId = Authentication.getUserDetails().ID;
const rcPromise = ResourceControlService.applyResourceControl(userId, accessControlData, resourceControl);
const webhookPromise = $q.when(endpoint.Type !== 4 && $scope.formValues.Webhook && WebhookService.createServiceWebhook(serviceId, endpoint.ID));
const webhookPromise = $q.when(endpoint.Type !== 4 && $scope.formValues.Webhook && WebhookService.createServiceWebhook(serviceId, endpoint.Id));
return $q.all([rcPromise, webhookPromise]);
})
.then(function success() {