fix js console error for access control and stack page (#7347)

pull/7385/head
Richard Wei 2 years ago committed by GitHub
parent 423dd5e394
commit 0f617f7f87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -6,7 +6,7 @@ import { r2a } from '@/react-tools/react2angular';
import { TeamMembership, Role } from '@/portainer/teams/types';
import { useUserMembership } from '@/portainer/users/queries';
import { Table, TableContainer, TableTitle } from '@@/datatables';
import { TableContainer, TableTitle } from '@@/datatables';
import { Button } from '@@/buttons';
import { ResourceControlType, ResourceId } from '../types';
@ -48,33 +48,31 @@ export function AccessControlPanel({
<div className="col-sm-12">
<TableContainer>
<TableTitle label="Access control" icon="eye" featherIcon />
<Table className="no-padding">
<AccessControlPanelDetails
resourceType={resourceType}
<AccessControlPanelDetails
resourceType={resourceType}
resourceControl={resourceControl}
/>
{!isEditDisabled && !isEditMode && (
<div className="row">
<div>
<Button color="link" onClick={toggleEditMode}>
<Icon icon="edit" className="space-right" feather />
Change ownership
</Button>
</div>
</div>
)}
{isEditMode && (
<AccessControlPanelForm
resourceControl={resourceControl}
onCancelClick={() => toggleEditMode()}
resourceId={resourceId}
resourceType={resourceType}
onUpdateSuccess={handleUpdateSuccess}
/>
{!isEditDisabled && !isEditMode && (
<div className="row">
<div>
<Button color="link" onClick={toggleEditMode}>
<Icon icon="edit" className="space-right" feather />
Change ownership
</Button>
</div>
</div>
)}
{isEditMode && (
<AccessControlPanelForm
resourceControl={resourceControl}
onCancelClick={() => toggleEditMode()}
resourceId={resourceId}
resourceType={resourceType}
onUpdateSuccess={handleUpdateSuccess}
/>
)}
</Table>
)}
</TableContainer>
</div>
</div>

@ -316,7 +316,7 @@ angular.module('portainer.app').controller('StackController', [
}
function loadStack(id) {
return $async(() => {
return $async(async () => {
var agentProxy = $scope.applicationState.endpoint.mode.agentProxy;
getEnvironments()

Loading…
Cancel
Save