Confirmation alert: return 'No' as default value when clicking anothe…

…r action. (#1257)

* Confirmation alert: return 'No' as default value when clicking another action.

* Disallow clicking other actions with open alert/prompt pop-up.

pyplanet/views/generics/alert.py

@@ -269,6 +269,7 @@ async def ask_confirmation(player, message, size='md', buttons=None):  # pragma:
 	:param buttons: Buttons, optional, default is yes and no.
 	:return: Number of button that is clicked.
 	"""
+	default_buttons_displayed = buttons is None
 	buttons = buttons or [{'name': 'Yes'}, {'name': 'No'}]
 	view = AlertView(message, size, buttons)
 	if isinstance(player, Player):
@@ -278,7 +279,10 @@ async def ask_confirmation(player, message, size='md', buttons=None):  # pragma:
 	try:
 		reaction = int(reaction)
 	except:
-		reaction = None
+		# If another action is clicked without completing the alert view, the action name (= string) is returned as reaction.
+		# To ensure no action is taken without confirmation, 1 (= No) should be returned if the casting causes an exception.
+		# If custom buttons are used, None will be returned.
+		reaction = 1 if default_buttons_displayed else None
 	del view
 	return reaction
 

pyplanet/views/templates/generics/alert.xml

@@ -1,5 +1,5 @@
 <frame pos="0 0" z-index="900">
-  <quad pos="0 0" size="320 180" halign="center" valign="center" style="Bgs1" substyle="BgDialogBlur" z-index="500" />
+  <quad pos="0 0" size="320 180" halign="center" valign="center" style="Bgs1" substyle="BgDialogBlur" z-index="500" scriptevents="1" />
   <quad pos="{{ sizes.top__pos }}" size="{{ sizes.top__size }}" halign="center" style="Bgs1InRace" substyle="BgGlow2" z-index="520" />
   <quad size="{{ sizes.box__size }}" halign="center" valign="center" style="Bgs1InRace" substyle="BgWindow2" z-index="510" />
   <quad pos="{{ sizes.bottom__pos }}" size="{{ sizes.bottom__size }}" halign="center" style="Bgs1InRace" substyle="BgMetalBar" z-index="520" />

pyplanet/views/templates/generics/prompt.xml

@@ -1,5 +1,5 @@
 <frame pos="0 0" z-index="900">
-  <quad pos="0 0" size="320 180" halign="center" valign="center" style="Bgs1" substyle="BgDialogBlur" z-index="500" />
+  <quad pos="0 0" size="320 180" halign="center" valign="center" style="Bgs1" substyle="BgDialogBlur" z-index="500" scriptevents="1" />
   <quad pos="{{ sizes.top__pos }}" size="{{ sizes.top__size }}" halign="center" style="Bgs1InRace" substyle="BgGlow2" z-index="520" />
   <quad size="{{ sizes.box__size }}" halign="center" valign="center" style="Bgs1InRace" substyle="BgWindow2" z-index="510" />
   <quad pos="{{ sizes.bottom__pos }}" size="{{ sizes.bottom__size }}" halign="center" style="Bgs1InRace" substyle="BgMetalBar" z-index="520" />