[FIX] Direct Message names not visible on Admin panel (#15114)

pull/15135/head^2
Guilherme Gazzo 7 years ago committed by Diego Sampaio
parent 8cd4b0f126
commit 4b937c65c5
  1. 4
      app/lib/lib/roomTypes/direct.js
  2. 8
      app/ui-admin/client/rooms/adminRooms.js
  3. 9
      app/utils/lib/RoomTypeConfig.js

@ -101,10 +101,6 @@ export class DirectMessageRoomType extends RoomTypeConfig {
return Session.get(`user_${ subscription.name }_status_text`);
}
getDisplayName(room) {
return room.usernames.join(' x ');
}
allowRoomSettingChange(room, setting) {
switch (setting) {
case RoomSettingsEnum.NAME:

@ -12,18 +12,19 @@ import { SideNav, RocketChatTabBar, TabBar } from '../../../ui-utils';
import { t, roomTypes } from '../../../utils';
import { hasAllPermission } from '../../../authorization';
import { ChannelSettings } from '../../../channel-settings';
import { getAvatarURL } from '../../../utils/lib/getAvatarURL';
export const AdminChatRoom = new Mongo.Collection('rocketchat_room');
Template.adminRooms.helpers({
url() {
return roomTypes.getConfig(this.t).getAvatarPath(this);
return this.t === 'd' ? getAvatarURL({ username: `@${ this.usernames[0] }` }) : roomTypes.getConfig(this.t).getAvatarPath(this);
},
getIcon() {
return roomTypes.getIcon(this);
},
roomName() {
return roomTypes.getRoomName(this.t, this);
return this.t === 'd' ? this.usernames.join(' x ') : roomTypes.getRoomName(this.t, this);
},
searchText() {
const instance = Template.instance();
@ -52,9 +53,6 @@ Template.adminRooms.helpers({
const rooms = Template.instance().rooms();
return rooms && rooms.count();
},
name() {
return roomTypes.roomTypes[this.t].getDisplayName(this);
},
type() {
return TAPi18n.__(roomTypes.roomTypes[this.t].label);
},

@ -150,15 +150,6 @@ export class RoomTypeConfig {
return this._route;
}
/**
* Gets the room's name to display in the UI.
*
* @param {object} room
*/
getDisplayName(room) {
return room.name;
}
allowRoomSettingChange(/* room, setting */) {
return true;
}

Loading…
Cancel
Save