Merge branch 'noc-inv-cosmetic' into 'master'

inv.inv cosmetic improvements See merge request noc/noc!8495
nocproject · Oct 8, 2024 · ce459cb · ce459cb
2 parents ac6e425 + bba7cfa
commit ce459cb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/ui/web/inv/inv/plugins/channel/ChannelPanel.js b/ui/web/inv/inv/plugins/channel/ChannelPanel.js
@@ -417,7 +417,8 @@ Ext.define("NOC.inv.inv.plugins.channel.ChannelPanel", {
         var data = Ext.decode(response.responseText);
         if(data.status){
           NOC.info(data.msg);
-          NOC.launch("inv.channel", "history", {"args": [data.channel]})
+          NOC.launch("inv.channel", "history", {"args": [data.channel]});
+          me.showChannelPanel();
         } else{
           NOC.error(data.msg);
         }

diff --git a/ui/web/inv/inv/plugins/channel/MagicPanel.js b/ui/web/inv/inv/plugins/channel/MagicPanel.js
@@ -16,6 +16,7 @@ Ext.define("NOC.inv.inv.plugins.channel.MagicPanel", {
       xtype: "grid",
       scrollable: "y",
       height: 310,
+      title: __("Create channel"),
       allowDeselect: true,
       store: new Ext.data.Store({
         fields: ["controller", "start_endpoint", "start_endpoint__label", "end_endpoint", "end_endpoint__label"],

diff --git a/ui/web/inv/inv/plugins/pconf/Controller.js b/ui/web/inv/inv/plugins/pconf/Controller.js
@@ -30,21 +30,21 @@ Ext.define("NOC.inv.inv.plugins.pconf.Controller", {
     vm.set("statusDisabled", hasStatuses);
   },
   onReload: function(){
-    var me = this;
-    me.getView().mask(__("Loading..."));
+    var me = this,
+      panel = me.getView();
+    panel.mask(__("Loading..."));
     Ext.Ajax.request({
       url: "/inv/inv/" + me.getView().currentId + "/plugin/pconf/",
       method: "GET",
       scope: me,
       success: function(response){
-        var data = Ext.decode(response.responseText),
-          view = me.getView();
-        view.preview(data);
-        view.unmask();
+        var data = Ext.decode(response.responseText);
+        panel.preview(data);
+        panel.unmask();
       },
       failure: function(){
         NOC.error(__("Failed to load data"));
-        me.getView().unmask();
+        panel.unmask();
       },
     });
   },

diff --git a/ui/web/inv/inv/plugins/pconf/PConfEditPlugin.js b/ui/web/inv/inv/plugins/pconf/PConfEditPlugin.js
@@ -65,6 +65,7 @@ Ext.define("NOC.inv.inv.plugins.pconf.PConfEditPlugin", {
           field: {
             xtype: "combobox",
             triggers: editorTriggers,
+            editable: false,
             store: {
               fields: ["id", "label"],
               data: record.get("options") || [],

diff --git a/ui/web/inv/inv/plugins/pconf/PConfPanel.js b/ui/web/inv/inv/plugins/pconf/PConfPanel.js
@@ -123,6 +123,7 @@ Ext.define("NOC.inv.inv.plugins.pconf.PConfPanel", {
       displayField: "text",
       valueField: "value",
       fieldLabel: __("Mode"),
+      labelWidth: 130,
       allowBlank: false,
       labelAlign: "right",
       bind: {
@@ -205,6 +206,7 @@ Ext.define("NOC.inv.inv.plugins.pconf.PConfPanel", {
       border: false,
       autoScroll: true,
       stateful: true,
+      emptyText: __("No data"),
       bind: {
         store: "{gridStore}",
       },