diff options
| author | Grégoire Aubert <gregoire.aubert@sonarsource.com> | 2018-09-27 15:51:22 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2018-10-10 20:20:58 +0200 |
| commit | 93bc0537dcb06d08d4f4ecf4f55d0539caa12268 (patch) | |
| tree | 5d90f13040b0e509e35318efc137e3f18ec64dc1 /server | |
| parent | 050f1aeaa16007d8fb4cc87b95d0ed0f1de14d46 (diff) | |
| download | sonarqube-93bc0537dcb06d08d4f4ecf4f55d0539caa12268.tar.gz sonarqube-93bc0537dcb06d08d4f4ecf4f55d0539caa12268.zip | |
SONAR-11270 Allow to set default template to APP
Diffstat (limited to 'server')
3 files changed, 4 insertions, 7 deletions
diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx index e702ca72b3d..1f67682cdc8 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavPlus.tsx @@ -170,9 +170,9 @@ export class GlobalNavPlus extends React.PureComponent<Props & WithRouterProps, {this.state.governanceReady && this.state.createPortfolio && ( <CreateFormShim + defaultQualifier={defaultQualifier} onClose={this.closeCreatePortfolioForm} onCreate={this.handleCreatePortfolio} - defaultQualifier={defaultQualifier} /> )} </> diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/AppContainer.js b/server/sonar-web/src/main/js/apps/permission-templates/components/AppContainer.js index 0b45197d190..c66f1f0b31e 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/AppContainer.js +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/AppContainer.js @@ -22,9 +22,6 @@ import App from './App'; import forSingleOrganization from '../../organizations/forSingleOrganization'; import { getAppState } from '../../../store/rootReducer'; -const mapStateToProps = state => ({ - // treat applications as portfolios - topQualifiers: getAppState(state).qualifiers.filter(q => q !== 'APP') -}); +const mapStateToProps = state => ({ topQualifiers: getAppState(state).qualifiers }); export default forSingleOrganization(connect(mapStateToProps)(App)); diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx index 5dd7cbd16da..ef234d81905 100644 --- a/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx @@ -55,7 +55,7 @@ export default class HoldersList extends React.PureComponent<Props> { renderItem(item: PermissionUser | PermissionGroup, permissions: PermissionDefinitions) { return this.isPermissionUser(item) ? ( <UserHolder - key={'user-' + item.login} + key={`user-${item.login}`} onToggle={this.props.onToggleUser} permissions={permissions} selectedPermission={this.props.selectedPermission} @@ -64,7 +64,7 @@ export default class HoldersList extends React.PureComponent<Props> { ) : ( <GroupHolder group={item} - key={'group-' + item.id} + key={`group-${item.id || item.name}`} onToggle={this.props.onToggleGroup} permissions={permissions} selectedPermission={this.props.selectedPermission} |