]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Fix click action on remove config resource button
authorMarcin Haba <marcin.haba@bacula.pl>
Sun, 5 Aug 2018 11:27:33 +0000 (13:27 +0200)
committerMarcin Haba <marcin.haba@bacula.pl>
Sun, 5 Aug 2018 11:27:33 +0000 (13:27 +0200)
gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl

index 192b6260e079c9a138dcb2eff699f2f20f68bead..cd7bacef33facc7efa4d681ef3526044009fe7d7 100644 (file)
@@ -7,18 +7,20 @@
                                <script type="text/javascript">
                                <%=$this->Resource->ClientID%>_mousedown = function(event) {
                                        var t = (event.target||event.srcElement);
+                                       var nn = t.nodeName.toUpperCase();
                                        var res_id = '<%=$this->Resource->ClientID%>';
-                                       if (t.parentNode.id != res_id && t.id != res_id && !/^<%=$this->RemoveResource->ClientID%>/.test(t.id)) {
+                                       if (nn != 'SVG' && nn != 'PATH' && t.parentNode.id != res_id && t.id != res_id && !/^<%=$this->RemoveResource->ClientID%>/.test(t.id)) {
                                                $('.validate, .validator').hide(); // hide validator messages
                                                $('#' + res_id).trigger('click');
                                        }
                                };
                                document.getElementById('<%=$this->RemoveResource->ClientID%>').onclick = function(event) {
                                        var t = (event.target||event.srcElement);
+                                       var nn = t.nodeName.toUpperCase();
                                        var cmsg = '<%[ Are you sure that you want to remove %s resource "%s"? ]%>';
                                        cmsg = cmsg.replace('%s', '<%=$this->Data['resource_type']%>');
                                        cmsg = cmsg.replace('%s', '<%=$this->Data['resource_name']%>');
-                                       if (/^<%=$this->RemoveResource->ClientID%>/.test(t.id) && confirm(cmsg)) {
+                                       if ((/^<%=$this->RemoveResource->ClientID%>/.test(t.id) || nn == 'SVG' || nn == 'PATH') && confirm(cmsg)) {
                                                return true;
                                        }
                                        return false;