Skip to content

Commit

Permalink
Merge pull request #1450 from phac-nml/fix-admin-usergroup-username
Browse files Browse the repository at this point in the history
User name set as 'Group Name' fixed
  • Loading branch information
ericenns authored Jan 24, 2023
2 parents bcfa491 + b7c45fd commit 9f4bf2a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* [Developer] Updated developer setup documentation, ignore java_pid*.hprof files, and added quality of life file `gradle.properties`
* [UI]: Refreshed global search page to use Ant Design. See [PR 1409](https://github.com/phac-nml/irida/pull/1409)
* [UI/Developer]: Removed old notification system hack and updated to use only Ant Design notifications. See [PR 1447](https://github.com/phac-nml/irida/pull/1447)
* [UI]: Fixed bug where the `User` column was named `User Group` on the admin User Groups page. [See PR 1450](https://github.com/phac-nml/irida/pull/1450)

## [22.09.6] - 2022/12/21
* [UI]: Fixed bug on NCBI Export page preventing the export from occuring. See [PR 1439](https://github.com/phac-nml/irida/pull/1439)
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/i18n/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ AddMemberButton.modal.okText=Add Member
ProjectUserGroups.title=User Groups
server.usergroups.remove.success={0} removed from this project.
server.usergroups.remove.error={0} cannot be removed from this project because it would leave the project without any managers.
ProjectUserGroupsTable.name=Group Name
ProjectUserGroupsTable.name=User
ProjectUserGroupsTable.projectRole=Project Role
ProjectUserGroupsTable.metadataData=Metadata Role
ProjectUserGroupsTable.created=Date Added
Expand Down

0 comments on commit 9f4bf2a

Please sign in to comment.