Commit 03fa6498 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'update-galaxy-stdout-fix' into '97-update-galaxy-to-23-2' 

Fix intermittent doubling of stdout and stderr in job info view

See merge request !77
parents 842c9f92 bbed8eae

client/src/components/JobInformation/JobInformation.vue

+3 −5
Original line number Diff line number Diff line 
<template>

    <div>

        <JobDetailsProvider auto-refresh :job-id="job_id" @update:result="updateJob"/>

        <JobConsoleOutputProvider

        <JobConsoleOutputProvider v-if="!jobIsTerminal"

            auto-refresh

            :job-id="job_id"

            :stdout_position="stdout_position"
@@ -145,12 +145,10 @@ export default { 
            // Load stored stdout and stderr

            if (this.jobIsTerminal) {

                if (job.tool_stdout) {

                    this.stdout_text += job.tool_stdout;

                    this.stdout_position += job.tool_stdout.length;

                    this.stdout_text = job.tool_stdout;

                }

                if (job.tool_stderr) {

                    this.stderr_text += job.tool_stderr;

                    this.stderr_position += job.tool_stderr.length;

                    this.stderr_text = job.tool_stderr;

                }

            }

        },