Merge pull request #224 from pangeachat/only-admins-toggle-spaces

Only admins toggle spaces
pull/1183/head
ggurdin 2 years ago committed by GitHub
commit 46a71d46d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -30,7 +30,9 @@ class StartChatFloatingActionButton extends StatelessWidget {
void _onPressed(BuildContext context) async { void _onPressed(BuildContext context) async {
//#Pangea //#Pangea
if (controller.activeSpaceId != null) { if (controller.activeSpaceId != null) {
context.go('/rooms/newgroup?spaceId=${controller.activeSpaceId ?? ''}'); context.go(
'/rooms/newgroup${controller.activeSpaceId != null ? '?spaceId=${controller.activeSpaceId}' : ''}',
);
return; return;
} }
//Pangea# //Pangea#
@ -44,7 +46,9 @@ class StartChatFloatingActionButton extends StatelessWidget {
case ActiveFilter.groups: case ActiveFilter.groups:
// #Pangea // #Pangea
// context.go('/rooms/newgroup'); // context.go('/rooms/newgroup');
context.go('/rooms/newgroup?spaceId=${controller.activeSpaceId ?? ''}'); context.go(
'/rooms/newgroup${controller.activeSpaceId != null ? '?spaceId=${controller.activeSpaceId}' : ''}',
);
// Pangea# // Pangea#
break; break;
case ActiveFilter.spaces: case ActiveFilter.spaces:

@ -815,6 +815,9 @@ extension PangeaRoom on Room {
); );
return false; return false;
} }
if (room != null && !room.isRoomAdmin) {
return false;
}
if (!pangeaCanSendEvent(EventTypes.spaceChild) && !isRoomAdmin) { if (!pangeaCanSendEvent(EventTypes.spaceChild) && !isRoomAdmin) {
return false; return false;
} }

@ -235,8 +235,13 @@ class AddToSpaceState extends State<AddToSpaceToggles> {
), ),
activeColor: AppConfig.activeToggleColor, activeColor: AppConfig.activeToggleColor,
value: isSuggestedInSpace(possibleParent), value: isSuggestedInSpace(possibleParent),
onChanged: (bool suggest) => onChanged: (bool suggest) => canAdd
setSuggested(suggest, possibleParent), ? setSuggested(suggest, possibleParent)
: ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(L10n.of(context)!.noPermission),
),
),
) )
: Container(), : Container(),
), ),

Loading…
Cancel
Save