[Libreoffice-commits] online.git: loleaflet/admin

gokaysatir (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 4 15:08:41 UTC 2020


 loleaflet/admin/src/AdminSocketSettings.js |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e703f2bac0d8dd05d44e47c45c1376e7a24a0946
Author:     gokaysatir <gokaysatir at collabora.com>
AuthorDate: Thu Jun 4 15:29:27 2020 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Jun 4 17:08:21 2020 +0200

    leaflet: fix admin console - shut down modal is not working properly.
    
    Change-Id: I7a85808715eb44c7f5c8c50151bc0fc1c54b0d71
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95510
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/loleaflet/admin/src/AdminSocketSettings.js b/loleaflet/admin/src/AdminSocketSettings.js
index ab43bd605..f57423634 100644
--- a/loleaflet/admin/src/AdminSocketSettings.js
+++ b/loleaflet/admin/src/AdminSocketSettings.js
@@ -36,9 +36,11 @@ var AdminSocketSettings = AdminSocketBase.extend({
 						$.extend({}, vex.dialog.buttons.YES, { text: _('OK') }),
 						$.extend({}, vex.dialog.buttons.NO, { text: _('Cancel') })
 					],
-					callback: function() {
+					callback: function(value) {
 						// TODO: Prompt for reason.
-						socketSettings.send('shutdown maintenance');
+						if (value) {
+							socketSettings.send('shutdown maintenance');
+						}
 					}
 				});
 			});


More information about the Libreoffice-commits mailing list