chore: buttons have a discernible text

ColdTrick · Jul 19, 2023 · 5c8d175 · 5c8d175
1 parent 8c2fdab
commit 5c8d175
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/actions/groups/edit.php b/actions/groups/edit.php
@@ -146,7 +146,7 @@
 $admin_approve = ($admin_approve && !elgg_is_admin_logged_in()); // admins don't need to wait
 
 $concept_group = (bool) elgg_get_plugin_setting('concept_groups', 'group_tools');
-$concept_group = $concept_group && !empty(get_input('concept_group'));
+$concept_group = $concept_group && (bool) get_input('concept_group');
 
 // new groups get access private, so an admin can validate it
 $access_id = (int) $group->access_id;

diff --git a/actions/groups/invite.php b/actions/groups/invite.php
@@ -30,9 +30,7 @@
 	}
 
 	// add users directly?
-	if (get_input('submit') == elgg_echo('group_tools:add_users')) {
-		$adding = true;
-	}
+	$adding = (bool) get_input('submit');
 }
 
 $group_guid = (int) get_input('group_guid');

diff --git a/views/default/admin/groups/bulk_delete.php b/views/default/admin/groups/bulk_delete.php
@@ -31,7 +31,7 @@
 $batch = new ElggBatch('elgg_get_entities', $options);
 
 $delete_button = elgg_view('input/submit', [
-	'value' => elgg_echo('group_tools:delete_selected'),
+	'text' => elgg_echo('group_tools:delete_selected'),
 	'class' => 'elgg-button-submit float-alt mvs',
 	'data-confirm' => elgg_echo('deleteconfirm:plural'),
 ]);

diff --git a/views/default/forms/groups/edit.php b/views/default/forms/groups/edit.php
@@ -126,7 +126,8 @@
 	$buttons[] = [
 		'#type' => 'submit',
 		'name' => 'concept_group',
-		'value' => elgg_echo('group_tools:group:edit:save:concept'),
+		'value' => 1,
+		'text' => elgg_echo('group_tools:group:edit:save:concept'),
 	];
 }
 

diff --git a/views/default/forms/groups/invite.php b/views/default/forms/groups/invite.php
@@ -80,14 +80,16 @@
 	[
 		'#type' => 'submit',
 		'name' => 'submit',
-		'value' => elgg_echo('invite'),
+		'value' => 0,
+		'text' => elgg_echo('invite'),
 	],
 ];
 if (elgg_is_admin_logged_in()) {
 	$footer_fields[] = [
 		'#type' => 'submit',
 		'name' => 'submit',
-		'value' => elgg_echo('group_tools:add_users'),
+		'value' => 1,
+		'text' => elgg_echo('group_tools:add_users'),
 		'data-confirm' => elgg_echo('group_tools:group:invite:add:confirm'),
 	];
 }