Unverified Commit 38b7c2ed authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #14171 from dannon/single-line-history-title 

[22.05] History edit attributes tweaks
parents b5ddd18f 5abd7890

client/src/components/History/Layout/Details.vue

+9 −1
Original line number Diff line number Diff line
@@ -21,13 +21,15 @@ 


        <!-- edit form, change title, annotation, or tags -->

        <div v-else class="mt-3" data-description="edit form">

            <b-textarea

            <b-input

                ref="name"

                v-model="localProps.name"

                class="mb-2"

                placeholder="Name"

                trim

                max-rows="4"

                data-description="name input"

                @keyup.enter="onSave"

                @keyup.esc="onToggle" />

            <b-textarea

                v-if="showAnnotation"
@@ -102,6 +104,12 @@ export default { 
                annotation: this.annotation,

                tags: this.tags,

            };

            // After dom update, focus on input

            this.$nextTick(() => {

                if (this.$refs.name) {

                    this.$refs.name.focus();

                }

            });

        },

    },

};

lib/galaxy/selenium/navigates_galaxy.py

+5 −1
Original line number Diff line number Diff line
@@ -1589,6 +1589,10 @@ class NavigatesGalaxy(HasDriver): 
        if self.is_beta_history():

            editable_text_input_element.clear()

        editable_text_input_element.send_keys(new_name)

        if not self.is_beta_history():

            # in the new history 'enter' submits the change, which we don't want

            # to automatically do here since we may edit other fields prior to

            # submitting

            self.send_enter(editable_text_input_element)

        return editable_text_input_element