From e24293432e183179c74405eaae4ecf157a3b039f Mon Sep 17 00:00:00 2001 From: Kelrap Date: Wed, 17 Jul 2024 12:42:39 -0400 Subject: [PATCH] Not show option to add students to subspace --- lib/pages/chat_details/chat_details_view.dart | 4 +++- .../children_and_parents_extension.dart | 6 ++++-- .../pangea_room_extension/pangea_room_extension.dart | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index 8b496afab..24db0f582 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -436,7 +436,9 @@ class ChatDetailsView extends StatelessWidget { onTap: () => context.go('/rooms/${room.id}/invite'), ), - if (room.showClassEditOptions && room.isSpace) + if (room.showClassEditOptions && + room.isSpace && + !room.isSubspace) SpaceDetailsToggleAddStudentsTile( controller: controller, ), diff --git a/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart b/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart index e89740788..4f71225ac 100644 --- a/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension/children_and_parents_extension.dart @@ -1,6 +1,8 @@ part of "pangea_room_extension.dart"; extension ChildrenAndParentsRoomExtension on Room { + bool get _isSubspace => _pangeaSpaceParents.isNotEmpty; + //note this only will return rooms that the user has joined or been invited to List get _joinedChildren { if (!isSpace) return []; @@ -91,7 +93,7 @@ extension ChildrenAndParentsRoomExtension on Room { String _nameIncludingParents(BuildContext context) { String nameSoFar = getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)); Room currentRoom = this; - if (currentRoom.pangeaSpaceParents.isEmpty) { + if (!currentRoom._isSubspace) { return nameSoFar; } currentRoom = currentRoom.pangeaSpaceParents.first; @@ -100,7 +102,7 @@ extension ChildrenAndParentsRoomExtension on Room { nameToAdd = nameToAdd.length <= 10 ? nameToAdd : "${nameToAdd.substring(0, 10)}..."; nameSoFar = '$nameToAdd > $nameSoFar'; - if (currentRoom.pangeaSpaceParents.isEmpty) { + if (!currentRoom._isSubspace) { return nameSoFar; } return "... > $nameSoFar"; diff --git a/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart index 8632f5e1e..3beb6463b 100644 --- a/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart +++ b/lib/pangea/extensions/pangea_room_extension/pangea_room_extension.dart @@ -122,6 +122,9 @@ extension PangeaRoom on Room { }) async => await _pangeaSetSpaceChild(roomId, suggested: suggested); + /// Checks if this space has a parent space + bool get isSubspace => _isSubspace; + // class_and_exchange_settings DateTime? get rulesUpdatedAt => _rulesUpdatedAt;