github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Show revisions/comments on singletons

Browse Source 
Fixes #978
This commit is contained in:
rijkvanzanten
2020-11-13 10:34:35 -05:00
parent 8057081ce6
commit 49f261f990
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/composables/use-collection/use-collection.ts
View File

@@ -46,5 +46,9 @@ export function useCollection(collectionKey: string | Ref<string>) {
return info.value?.meta?.sort_field || null;
});
return { info, fields, defaults, primaryKeyField, userCreatedField, sortField };
const isSingleton = computed(() => {
return info.value?.meta?.singleton === true;
});
return { info, fields, defaults, primaryKeyField, userCreatedField, sortField, isSingleton };
}

20
app/src/modules/collections/routes/item.vue
View File

@@ -180,16 +180,16 @@
<div class="page-description" v-html="marked($t('page_help_collections_item'))" />
</sidebar-detail>
<revisions-drawer-detail
v-if="collectionInfo.meta && collectionInfo.meta.singleton === false && isNew === false"
v-if="isNew === false && _primaryKey"
:collection="collection"
:primary-key="primaryKey"
:primary-key="_primaryKey"
ref="revisionsDrawerDetail"
@revert="refresh"
/>
<comments-sidebar-detail
v-if="collectionInfo.meta && collectionInfo.meta.singleton === false && isNew === false"
v-if="isNew === false && _primaryKey"
:collection="collection"
:primary-key="primaryKey"
:primary-key="_primaryKey"
/>
</template>
</private-view>
@@ -254,7 +254,7 @@ export default defineComponent({
const revisionsDrawerDetail = ref<Vue | null>(null);
const { info: collectionInfo, defaults, primaryKeyField } = useCollection(collection);
const { info: collectionInfo, defaults, primaryKeyField, isSingleton } = useCollection(collection);
const {
isNew,
@@ -338,6 +338,14 @@ export default defineComponent({
isNew
);
const _primaryKey = computed(() => {
if (isNew.value) return '+';
if (isSingleton.value) return item.value?.[primaryKeyField.value?.field];
return props.primaryKey;
});
return {
item,
loading,
@@ -377,6 +385,8 @@ export default defineComponent({
validationErrors,
form,
fields,
isSingleton,
_primaryKey,
};
function useBreadcrumb() {