From 005afb218dd4b462d4abb8533cf77977b2bea12c Mon Sep 17 00:00:00 2001 From: Eriks Jenkevics Date: Thu, 18 Aug 2016 17:12:20 +0300 Subject: [PATCH] Dashboard import should use name from xml file if not provided by user fixes #999 --- ChangeLog | 2 +- .../dashboard/dialogs/ImportDashboardDialog.java | 10 +++++++--- .../dashboard/dialogs/ImportDashboardDialog.java | 10 +++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 447e28380..abfb1b3bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,7 +16,7 @@ - Management console - New editors for Agent Config Policy and Log Parser Policy. - DCI summary tables with empty menu path not shown in object context menu -- Fixed issues: #92, #906, #959, #1006, #1051, #1096, #1159, #1187, #1191, #1230, #1237, #1254, #1263 +- Fixed issues: #92, #906, #959, #999, #1006, #1051, #1096, #1159, #1187, #1191, #1230, #1237, #1254, #1263 * diff --git a/src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/dialogs/ImportDashboardDialog.java b/src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/dialogs/ImportDashboardDialog.java index 7fc51759e..0fac103f8 100644 --- a/src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/dialogs/ImportDashboardDialog.java +++ b/src/java/netxms-eclipse/Dashboard/src/org/netxms/ui/eclipse/dashboard/dialogs/ImportDashboardDialog.java @@ -38,6 +38,7 @@ import org.netxms.ui.eclipse.widgets.LabeledText; public class ImportDashboardDialog extends Dialog { private String objectName; + private int index; private File importFile; private LabeledText textName; private LocalFileSelector importFileSelector; @@ -104,12 +105,15 @@ public class ImportDashboardDialog extends Dialog protected void okPressed() { objectName = textName.getText().trim(); + importFile = importFileSelector.getFile(); if (objectName.isEmpty()) { - MessageDialogHelper.openWarning(getShell(), Messages.get().ImportDashboardDialog_Warning, Messages.get().ImportDashboardDialog_WarningValidName); - return; + objectName = importFile.getName(); + index = objectName.indexOf(".xml"); + objectName = objectName.substring(0, index); + super.okPressed(); } - importFile = importFileSelector.getFile(); + if (importFile == null) { MessageDialogHelper.openWarning(getShell(), Messages.get().ImportDashboardDialog_Warning, Messages.get().ImportDashboardDialog_WarningSelectFile); diff --git a/webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/dialogs/ImportDashboardDialog.java b/webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/dialogs/ImportDashboardDialog.java index 7fc51759e..0fac103f8 100644 --- a/webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/dialogs/ImportDashboardDialog.java +++ b/webui/webapp/Dashboard/src/org/netxms/ui/eclipse/dashboard/dialogs/ImportDashboardDialog.java @@ -38,6 +38,7 @@ import org.netxms.ui.eclipse.widgets.LabeledText; public class ImportDashboardDialog extends Dialog { private String objectName; + private int index; private File importFile; private LabeledText textName; private LocalFileSelector importFileSelector; @@ -104,12 +105,15 @@ public class ImportDashboardDialog extends Dialog protected void okPressed() { objectName = textName.getText().trim(); + importFile = importFileSelector.getFile(); if (objectName.isEmpty()) { - MessageDialogHelper.openWarning(getShell(), Messages.get().ImportDashboardDialog_Warning, Messages.get().ImportDashboardDialog_WarningValidName); - return; + objectName = importFile.getName(); + index = objectName.indexOf(".xml"); + objectName = objectName.substring(0, index); + super.okPressed(); } - importFile = importFileSelector.getFile(); + if (importFile == null) { MessageDialogHelper.openWarning(getShell(), Messages.get().ImportDashboardDialog_Warning, Messages.get().ImportDashboardDialog_WarningSelectFile); -- 2.20.1