Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions panel/src/components/Forms/Field/LinkField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,32 +58,32 @@
</div>

<!-- Page or file browser -->
<div
v-if="currentType.id === 'page'"
v-show="expanded"
data-type="page"
class="k-link-input-body"
>
<div class="k-page-browser">
<k-page-tree
:current="$helper.link.getPageUUID(value)"
:root="false"
<template v-if="expanded">
<div
v-if="currentType.id === 'page'"
data-type="page"
class="k-link-input-body"
>
<div class="k-page-browser">
<k-page-tree
:current="$helper.link.getPageUUID(value)"
:root="false"
@select="selectModel($event)"
/>
</div>
</div>
<div
v-else-if="currentType.id === 'file'"
data-type="file"
class="k-link-input-body"
>
<k-file-browser
:opened="$panel.view.props.model.uuid ?? $panel.view.props.model.id"
:selected="$helper.link.getFileUUID(value)"
@select="selectModel($event)"
/>
</div>
</div>
<div
v-else-if="currentType.id === 'file'"
v-show="expanded"
data-type="file"
class="k-link-input-body"
>
<k-file-browser
:opened="$panel.view.props.model.uuid ?? $panel.view.props.model.id"
:selected="$helper.link.getFileUUID(value)"
@select="selectModel($event)"
/>
</div>
</template>
</k-input>
</k-field>
</template>
Expand Down
11 changes: 10 additions & 1 deletion panel/src/components/Navigation/PageTree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,24 @@ export default {
this.$set(item, "loading", false);
},
async preselect(page) {
// skip the parents API call
// if the page is already in the loaded items
const existing = this.findItem(page);

if (existing) {
this.$emit("select", existing);
return;
}

// get array of parent uuids/ids
const response = await this.$panel.get("site/tree/parents", {
query: {
page,
root: this.root
}
});
const parents = response.data;

const parents = response.data;
let tree = this;

// go through all parents, try to find the matching item,
Expand Down
Loading