Skip to content

Commit

Permalink
cherry pick system admin fix into master branch (#1666)
Browse files Browse the repository at this point in the history
* get system admin role for user management, in addition to other public roles. (#1622)

* bump hotfix version.
  • Loading branch information
devinleighsmith authored Jun 28, 2022
1 parent 999d938 commit 38b2c24
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion backend/api/Pims.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
<Version>1.1.0-29.32</Version>
<Version>1.1.1-29.32</Version>
<AssemblyVersion>1.1.0.29</AssemblyVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frontend",
"version": "1.1.0-29.32",
"version": "1.1.1-29.32",
"private": true,
"dependencies": {
"@bcgov/bc-sans": "1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/features/admin/edit-user/EditUserForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ const EditUserForm: React.FunctionComponent<IEditUserFormProps> = ({
formUser,
onCancel,
}) => {
const { getPublicByType } = useLookupCodeHelpers();
const roles = getPublicByType(API.ROLE_TYPES);
const { getPublicByType, getByType } = useLookupCodeHelpers();
const roles = getByType(API.ROLE_TYPES);
const regions = getPublicByType(API.REGION_TYPES).filter(
region => region.name !== 'Cannot determine',
);
Expand Down

0 comments on commit 38b2c24

Please sign in to comment.