Compare commits

...

3 Commits

Author SHA1 Message Date
Prabhat Khera
97e00cf8b3 bump version to 2.16.2 (#8083) 2022-11-21 13:09:36 +13:00
cmeng
5ab77e07c3 fix(git): EE-4577 Git Repository Fields are Missing in Edge Stacks (#8058) 2022-11-18 09:00:07 +13:00
Oscar Zhou
71216bd585 fix(access/viwer): update the viwer filter key to user.id (#8056) 2022-11-17 10:38:23 +13:00
9 changed files with 18 additions and 9 deletions

View File

@@ -931,7 +931,7 @@
],
"version": {
"DB_UPDATING": "false",
"DB_VERSION": "71",
"DB_VERSION": "72",
"INSTANCE_ID": "null"
}
}

View File

@@ -84,7 +84,7 @@ type Handler struct {
}
// @title PortainerCE API
// @version 2.16.1
// @version 2.16.2
// @description.markdown api-description.md
// @termsOfService

View File

@@ -1451,9 +1451,9 @@ type (
const (
// APIVersion is the version number of the Portainer API
APIVersion = "2.16.1"
APIVersion = "2.16.2"
// DBVersion is the version number of the Portainer database
DBVersion = 71
DBVersion = 72
// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax
ComposeSyntaxMaxVersion = "3.9"
// AssetsServerURL represents the URL of the Portainer asset server

View File

@@ -21,7 +21,7 @@
<file-upload-description> You can upload a Compose file from your computer. </file-upload-description>
</file-upload-form>
<git-form ng-if="$ctrl.state.Method === 'repository'" model="$ctrl.formValues" on-change="($ctrl.onChangeFormValues)"></git-form>
<git-form ng-if="$ctrl.state.Method === 'repository'" model="$ctrl.formValues" on-change="($ctrl.onChangeFormValues)" hide-rebuild-info="true"></git-form>
<!-- template -->
<div ng-if="$ctrl.state.Method === 'template'">

View File

@@ -21,4 +21,10 @@
</file-upload-description>
</file-upload-form>
<git-form ng-if="$ctrl.state.Method === 'repository'" deploy-method="kubernetes" model="$ctrl.formValues" on-change="($ctrl.onChangeFormValues)"></git-form>
<git-form
ng-if="$ctrl.state.Method === 'repository'"
deploy-method="kubernetes"
model="$ctrl.formValues"
on-change="($ctrl.onChangeFormValues)"
hide-rebuild-info="true"
></git-form>

View File

@@ -1,11 +1,12 @@
export default class GitFormController {
/* @ngInject */
constructor(StateManager) {
this.StateManager = StateManager;
this.onChangeField = this.onChangeField.bind(this);
this.onChangeURL = this.onChangeField('RepositoryURL');
this.onChangeRefName = this.onChangeField('RepositoryReferenceName');
this.onChangeComposePath = this.onChangeField('ComposeFilePathInRepository');
this.isDockerStandalone = StateManager.getState().endpoint.mode.provider === 'DOCKER_STANDALONE';
}
onChangeField(field) {
@@ -19,5 +20,6 @@ export default class GitFormController {
$onInit() {
this.deployMethod = this.deployMethod || 'compose';
this.isDockerStandalone = !this.hideRebuildInfo && this.StateManager.getState().endpoint.mode.provider === 'DOCKER_STANDALONE';
}
}

View File

@@ -11,5 +11,6 @@ export const gitForm = {
autoUpdate: '<',
showAuthExplanation: '<',
showForcePullImage: '<',
hideRebuildInfo: '@',
},
};

View File

@@ -34,7 +34,7 @@ export default class AccessViewerController {
throw new Error('User not found');
}
const userMemberships = _.filter(this.teamMemberships, { UserId: user.value });
const userMemberships = _.filter(this.teamMemberships, { UserId: user.Id });
for (const [, endpoint] of _.entries(this.endpoints)) {
let role = this.getRoleFromUserEndpointPolicy(user, endpoint);

View File

@@ -2,7 +2,7 @@
"author": "Portainer.io",
"name": "portainer",
"homepage": "http://portainer.io",
"version": "2.16.1",
"version": "2.16.2",
"repository": {
"type": "git",
"url": "git@github.com:portainer/portainer.git"