From 934a88fdfc0e1a7ae9684864fdc9b8473338d306 Mon Sep 17 00:00:00 2001 From: uncol Date: Sun, 7 Mar 2021 21:53:39 +0300 Subject: [PATCH 1/2] core.combo fixed --- ui/web/core/ComboBox.js | 3 +++ ui/web/inv/inv/CreateConnectionForm.js | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/web/core/ComboBox.js b/ui/web/core/ComboBox.js index 7cf88cc3b9..c7f5ff9dd5 100644 --- a/ui/web/core/ComboBox.js +++ b/ui/web/core/ComboBox.js @@ -114,6 +114,9 @@ Ext.define("NOC.core.ComboBox", { this.pickerId = this.getId() + '_picker'; // end me.showTriggers(null); + if(!Ext.isEmpty(me.query)) { + Ext.apply(me.store.proxy.extraParams, me.query); + } this.callParent(); }, diff --git a/ui/web/inv/inv/CreateConnectionForm.js b/ui/web/inv/inv/CreateConnectionForm.js index c312196a58..97bc68a162 100644 --- a/ui/web/inv/inv/CreateConnectionForm.js +++ b/ui/web/inv/inv/CreateConnectionForm.js @@ -49,7 +49,7 @@ Ext.define("NOC.inv.inv.CreateConnectionForm", { plugins: ["spriteevents"] }); me.cableCombo = Ext.create({ - xtype: "core.combo", + xtype: "combo", fieldLabel: __("Cable"), labelAlign: "right", labelWidth: 50, @@ -301,7 +301,6 @@ Ext.define("NOC.inv.inv.CreateConnectionForm", { return pin.sprite.attr.pinName; }, beforeDestroy: function() { - console.log("beforeDestroy"); var me = this, target = me.formPanelDropTarget; if(target) { @@ -332,7 +331,6 @@ Ext.define("NOC.inv.inv.CreateConnectionForm", { } if(pin.sprite.labelAlign === "left") { mainPanel.getViewModel().set("leftSelectedPin", mainPanel.deSelectPin(pin, mainPanel.getViewModel().get("leftSelectedPin"), "left")); - console.log(mainPanel.getViewModel().get("leftSelectedPin")); } if(pin.sprite.labelAlign === "right") { mainPanel.getViewModel().set("rightSelectedPin", mainPanel.deSelectPin(pin, mainPanel.getViewModel().get("rightSelectedPin"), "right")); @@ -373,7 +371,6 @@ Ext.define("NOC.inv.inv.CreateConnectionForm", { if(cable) { param.cable = cable; } - console.log("connect :", param); Ext.Ajax.request({ url: "/inv/inv/connect/", method: "POST", @@ -381,7 +378,6 @@ Ext.define("NOC.inv.inv.CreateConnectionForm", { scope: me, success: function(response) { var data = Ext.decode(response.responseText); - console.log(data); NOC.msg.complete(__("Objects was successfully connected")); }, failure: function(response) { -- GitLab From 89556fda45165c2afc97d5325666112a10d92894 Mon Sep 17 00:00:00 2001 From: uncol Date: Wed, 10 Mar 2021 13:10:23 +0300 Subject: [PATCH 2/2] fm.event filters fixed --- ui/web/fm/event/Application.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/web/fm/event/Application.js b/ui/web/fm/event/Application.js index 3143c9e403..f4d146974e 100644 --- a/ui/web/fm/event/Application.js +++ b/ui/web/fm/event/Application.js @@ -201,7 +201,7 @@ Ext.define("NOC.fm.event.Application", { }, items: [ { - xtype: "core.combo", + xtype: "combo", fieldLabel: __("State"), editable: false, queryMode: "local", @@ -222,7 +222,7 @@ Ext.define("NOC.fm.event.Application", { }, { xtype: "core.combo", - url: "/sa/managedobject/lookup/", + restUrl: "/sa/managedobject/lookup/", fieldLabel: __("Object"), name: "managed_object", bind: { @@ -240,7 +240,7 @@ Ext.define("NOC.fm.event.Application", { }, { xtype: "core.combo", - url: "/sa/managedobjectselector/lookup/", + restUrl: "/sa/managedobjectselector/lookup/", fieldLabel: __("Selector"), name: "managedobjectselector", bind: { @@ -249,7 +249,7 @@ Ext.define("NOC.fm.event.Application", { }, { xtype: "core.combo", - url: "/fm/eventclass/lookup/", + restUrl: "/fm/eventclass/lookup/", fieldLabel: __("Event Class"), name: "event_class", bind: { -- GitLab