Unverified Commit 881ed5c7 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #14269 from guerler/hide_delete_list_view 

[22.05] Allow delete option when history items are shown outside of panel
parents 31e1c3d1 6b4c7c8a

client/src/components/History/Content/ContentItem.vue

+2 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
            <DatasetDetails

                v-if="expandDataset"

                :dataset="item"

                :show-highlight="isHistoryItem && isHistPanel"

                :show-highlight="isHistoryItem"

                @edit="onEdit"

                @toggleHighlights="toggleHighlights" />

        </b-collapse>
@@ -115,8 +115,7 @@ export default { 
        highlight: { type: String, default: null },

        id: { type: Number, required: true },

        isDataset: { type: Boolean, default: true },

        isHistoryItem: { type: Boolean, default: true },

        isHistPanel: { type: Boolean, default: false },

        isHistoryItem: { type: Boolean, default: false },

        item: { type: Object, required: true },

        name: { type: String, required: true },

        selected: { type: Boolean, default: false },

client/src/components/History/Content/GenericElement.vue

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
            :name="item.element_identifier"

            :is-dataset="item.element_type == 'hda'"

            :expand-dataset="expandDataset"

            :is-history-item="false"

            @update:expand-dataset="expandDataset = $event"

            @view-collection="viewCollection = !viewCollection" />

        <GenericItem v-if="viewCollection" :item-id="item.object.id" :item-src="item.object.history_content_type" />

client/src/components/History/Content/GenericItem.vue

+4 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
        <loading-span v-if="loading" message="Loading dataset" />

        <div v-else>

            <ContentItem

                is-history-item

                :id="item.hid"

                :item="item"

                :name="item.name"
@@ -10,9 +11,9 @@ 
                :is-dataset="item.history_content_type == 'dataset'"

                @update:expand-dataset="expandDataset = $event"

                @view-collection="viewCollection = !viewCollection"

                @delete="onDelete"

                @undelete="onUndelete"

                @unhide="onUnhide" />

                @delete="onDelete(item)"

                @undelete="onUndelete(item)"

                @unhide="onUnhide(item)" />

            <div v-if="viewCollection">

                <div v-for="(collectionItem, collectionIndex) in item.elements" :key="collectionIndex">

                    <GenericElement :item="collectionItem" />

client/src/components/History/CurrentCollection/CollectionPanel.vue

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
                                    :name="item.element_identifier"

                                    :expand-dataset="isExpanded(item)"

                                    :is-dataset="item.element_type == 'hda'"

                                    :is-history-item="false"

                                    @update:expand-dataset="setExpanded(item, $event)"

                                    @view-collection="onViewSubCollection" />

                            </template>

client/src/components/History/CurrentHistory/HistoryPanel.vue

+1 −1
Original line number Diff line number Diff line
@@ -100,12 +100,12 @@ 
                                <template v-slot:item="{ item, currentOffset }">

                                    <ContentItem

                                        v-if="!invisible[item.hid]"

                                        is-history-item

                                        :id="item.hid"

                                        :item="item"

                                        :name="item.name"

                                        :expand-dataset="isExpanded(item)"

                                        :is-dataset="isDataset(item)"

                                        is-hist-panel

                                        :highlight="getHighlight(item)"

                                        :selected="isSelected(item)"

                                        :selectable="showSelection"