From dafac28abc8642bc3484d59cd0c1eef1d2fd5384 Mon Sep 17 00:00:00 2001
From: Maki Nishifuji <nishimaki10@users.noreply.github.com>
Date: Fri, 9 Sep 2016 03:11:29 +0900
Subject: [PATCH] Fix #4173 (#4226)
---
.../client/views/channelSettings.coffee | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.coffee b/packages/rocketchat-channel-settings/client/views/channelSettings.coffee
index 9254eecf1c4..d0a89e51260 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.coffee
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.coffee
@@ -41,8 +41,8 @@ Template.channelSettings.helpers
return t('True')
else
return t('False')
-
-
+
+
Template.channelSettings.events
'click .delete': ->
@@ -110,11 +110,10 @@ Template.channelSettings.onCreated ->
if not nameValidation.test value
return toastr.error t('error-invalid-room-name', { room_name: name: value })
- if @validateRoomName()
- RocketChat.callbacks.run 'roomNameChanged', { _id: room._id, name: value }
- Meteor.call 'saveRoomSettings', room._id, 'roomName', value, (err, result) ->
- return handleError err if err
- toastr.success TAPi18n.__ 'Room_name_changed_successfully'
+ RocketChat.callbacks.run 'roomNameChanged', { _id: room._id, name: value }
+ Meteor.call 'saveRoomSettings', room._id, 'roomName', value, (err, result) ->
+ return handleError err if err
+ toastr.success TAPi18n.__ 'Room_name_changed_successfully'
topic:
type: 'markdown'
@@ -163,7 +162,7 @@ Template.channelSettings.onCreated ->
save: (value, room) ->
Meteor.call 'saveRoomSettings', room._id, 'readOnly', value, (err, result) ->
return handleError err if err
- toastr.success TAPi18n.__ 'Read_only_changed_successfully'
+ toastr.success TAPi18n.__ 'Read_only_changed_successfully'
archived:
type: 'boolean'
--
GitLab