mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

isGeneratedScript TODO

Browse Source
This commit is contained in:
Jan Prochazka 2022-03-17 19:53:51 +01:00
parent 6c8eccd369
commit 6e041e9eed
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/api/src/controllers/runners.js
View File

@ -148,8 +148,8 @@ module.exports = {
},
start_meta: true,
async start({ script }) {
if (process.env.DISABLE_SHELL) {
async start({ script, isGeneratedScript }) {
if (!isGeneratedScript && process.env.DISABLE_SHELL) {
return { errorMessage: 'Shell is disabled' };
}

2
packages/web/src/modals/ImportExportModal.svelte
View File

@ -108,7 +108,7 @@
const script = await createImpExpScript($extensions, values);
executeNumber += 1;
let runid = runnerId;
const resp = await apiCall('runners/start', { script });
const resp = await apiCall('runners/start', { script, isGeneratedScript: true });
runid = resp.runid;
runnerId = runid;

6
packages/web/src/tabs/ShellTab.svelte
View File

@ -37,9 +37,9 @@
<script lang="ts">
import { getContext } from 'svelte';
import ToolStripCommandButton from '../buttons/ToolStripCommandButton.svelte';
import ToolStripContainer from '../buttons/ToolStripContainer.svelte';
import ToolStripSaveButton from '../buttons/ToolStripSaveButton.svelte';
import ToolStripCommandButton from '../buttons/ToolStripCommandButton.svelte';
import ToolStripContainer from '../buttons/ToolStripContainer.svelte';
import ToolStripSaveButton from '../buttons/ToolStripSaveButton.svelte';
import invalidateCommands from '../commands/invalidateCommands';
import registerCommand from '../commands/registerCommand';

2
packages/web/src/utility/exportFileTools.ts
View File

@ -44,7 +44,7 @@ export async function exportQuickExportFile(dataName, reader, format, columnMap
script.copyStream(sourceVar, targetVar, colmapVar);
script.put();
const resp = await apiCall('runners/start', { script: script.getScript() });
const resp = await apiCall('runners/start', { script: script.getScript(), isGeneratedScript: true });
const runid = resp.runid;
let isCanceled = false;