merging devel fixes
This commit is contained in:
+2
-2
@@ -8120,7 +8120,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
|
||||
id: 'topic_block',
|
||||
title: formatMessage(messages.block),
|
||||
handler: (params, errorHandler) => {
|
||||
return props.onShowAlert(formatMessage(messages.menu_item_block), formatMessage(messages.topic_block_warning), () => {
|
||||
return props.onShowAlert(formatMessage(messages.block), formatMessage(messages.topic_block_warning), () => {
|
||||
return this.topicPermissionSetter('-JP', params, errorHandler).then(ctrl => {
|
||||
this.props.onTopicRemoved(params.topicName);
|
||||
return ctrl;
|
||||
@@ -8168,7 +8168,7 @@ class ContextMenu extends (react__WEBPACK_IMPORTED_MODULE_0___default().Componen
|
||||
},
|
||||
'permissions': {
|
||||
id: 'permissions',
|
||||
title: formatMessage(messages.menu_item_edit_permissions),
|
||||
title: formatMessage(messages.edit_permissions),
|
||||
handler: null
|
||||
},
|
||||
'member_delete': {
|
||||
|
||||
Reference in New Issue
Block a user