Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Unable to edit a 'direct' room setting in the admin due to the room name #21636

Merged
merged 14 commits into from
Apr 29, 2021
Merged

[FIX] Unable to edit a 'direct' room setting in the admin due to the room name #21636

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
36203dd
Merge pull request #1 from RocketChat/develop
Jeanstaquet Mar 12, 2021
f0ca3f3
Merge pull request #2 from RocketChat/develop
Jeanstaquet Mar 22, 2021
579fecc
Merge pull request #3 from RocketChat/develop
Jeanstaquet Mar 24, 2021
c77a81a
Merge pull request #5 from RocketChat/develop
Jeanstaquet Mar 29, 2021
05fe364
Merge pull request #6 from RocketChat/develop
Jeanstaquet Apr 1, 2021
5d756bd
Merge pull request #7 from RocketChat/develop
Jeanstaquet Apr 7, 2021
9d0361a
Merge pull request #8 from RocketChat/develop
Jeanstaquet Apr 13, 2021
3d57173
Merge pull request #9 from RocketChat/develop
Jeanstaquet Apr 15, 2021
a94b15f
Merge pull request #10 from RocketChat/develop
Jeanstaquet Apr 17, 2021
26ef117
Adding the fix
Jeanstaquet Apr 18, 2021
38389fd
Cleaning
Jeanstaquet Apr 18, 2021
b895aa9
Updating the code
Jeanstaquet Apr 28, 2021
91d4bd3
Updating the code
Jeanstaquet Apr 28, 2021
526af5b
Merge branch 'develop' into FixSaveRoomInfoAdmin
Jeanstaquet Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/views/admin/rooms/EditRoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function EditRoom({ room, onChange }) {
const save = () =>
saveAction({
rid: room._id,
roomName,
roomName: roomType === 'd' ? undefined : roomName,
roomTopic,
roomType,
readOnly,
Expand Down