Merge pull request #9925 from dbeaver/datatransfer-variables-export#9648

#9648 Datatransfer variables export

plugins/org.jkiss.dbeaver.data.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseConsumerPageMapping.java

@@ -243,12 +243,12 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
                     @Override
                     public void widgetSelected(SelectionEvent e)
                     {
-                        DatabaseMappingObject selectedMapping = getSelectedMapping();
-                        DBPDataSourceContainer dataSourceContainer = selectedMapping.getTarget().getDataSource().getContainer();
-                        if(!dataSourceContainer.hasModifyPermission(DBPDataSourcePermission.PERMISSION_EDIT_METADATA)) {
+                        DBPDataSourceContainer dataSourceContainer = getDatabaseConsumerSettings().getContainerNode().getDataSourceContainer();
+                        if (!dataSourceContainer.hasModifyPermission(DBPDataSourcePermission.PERMISSION_EDIT_METADATA)) {
                             UIUtils.showMessageBox(getShell(), DTMessages.data_transfer_wizard_restricted_title, NLS.bind(DTMessages.data_transfer_wizard_restricted_description, dataSourceContainer.getName()), SWT.ICON_WARNING);
                             return;
                         }
+                        DatabaseMappingObject selectedMapping = getSelectedMapping();
                         showPreview(selectedMapping instanceof DatabaseMappingContainer ?
                             (DatabaseMappingContainer) selectedMapping :
                             ((DatabaseMappingAttribute)selectedMapping).getParent());

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/dialogs/SQLQueryParameterBindDialog.java

@@ -74,7 +74,9 @@ public class SQLQueryParameterBindDialog extends StatusDialog {
     public SQLQueryParameterBindDialog(IWorkbenchPartSite site, SQLQuery query, List<SQLQueryParameter> parameters)
     {
         super(site.getShell());
-        setShellStyle(SWT.CLOSE | SWT.TITLE | SWT.BORDER | SWT.RESIZE | getDefaultOrientation());
+        if (!UIUtils.isInDialog()) {
+            setShellStyle(SWT.CLOSE | SWT.TITLE | SWT.BORDER | SWT.RESIZE | getDefaultOrientation());
+        }
         this.site = site;
         StringWriter dummyWriter = new StringWriter();
         this.queryContext = new SQLScriptContext(null, new DataSourceContextProvider(query.getDataSource()), null, dummyWriter, null);