folder: fixes for timeline view
parent
1b14fc4901
commit
fbbfbf18ec
|
@ -222,7 +222,7 @@ class ApiBase extends Controller
|
||||||
|
|
||||||
protected function isRecursive()
|
protected function isRecursive()
|
||||||
{
|
{
|
||||||
return null === $this->request->getParam('folder') || "1" === $this->request->getParam('recursive');
|
return null === $this->request->getParam('folder') || $this->request->getParam('recursive');
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function isArchive()
|
protected function isArchive()
|
||||||
|
|
|
@ -637,7 +637,7 @@ export default defineComponent({
|
||||||
// Folder
|
// Folder
|
||||||
if (this.$route.name === "folders") {
|
if (this.$route.name === "folders") {
|
||||||
query.set("folder", utils.getFolderRoutePath(this.config_foldersPath));
|
query.set("folder", utils.getFolderRoutePath(this.config_foldersPath));
|
||||||
if(this.$route.query.recursive === "1") {
|
if (this.$route.query.recursive) {
|
||||||
query.set("recursive", "1");
|
query.set("recursive", "1");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,13 +17,17 @@
|
||||||
<div class="right-actions">
|
<div class="right-actions">
|
||||||
<NcActions :inline="2">
|
<NcActions :inline="2">
|
||||||
<NcActionRouter
|
<NcActionRouter
|
||||||
:to="{ query: recursive ? {} : {recursive: '1'}}"
|
:to="{ query: recursive ? {} : { recursive: '1' } }"
|
||||||
close-after-click
|
close-after-click
|
||||||
>
|
>
|
||||||
{{ t("memories", recursive ? "Show folders" : "Timeline") }}
|
{{
|
||||||
|
recursive
|
||||||
|
? t("memories", "Folder View")
|
||||||
|
: t("memories", "Timeline View")
|
||||||
|
}}
|
||||||
<template #icon>
|
<template #icon>
|
||||||
<FoldersIcon v-if="recursive" :size="20"/>
|
<FoldersIcon v-if="recursive" :size="20" />
|
||||||
<TimelineIcon v-else :size="20"/>
|
<TimelineIcon v-else :size="20" />
|
||||||
</template>
|
</template>
|
||||||
</NcActionRouter>
|
</NcActionRouter>
|
||||||
<NcActionButton
|
<NcActionButton
|
||||||
|
@ -72,12 +76,12 @@ export default defineComponent({
|
||||||
HomeIcon,
|
HomeIcon,
|
||||||
ShareIcon,
|
ShareIcon,
|
||||||
TimelineIcon,
|
TimelineIcon,
|
||||||
FoldersIcon
|
FoldersIcon,
|
||||||
},
|
},
|
||||||
|
|
||||||
data: () => ({
|
data: () => ({
|
||||||
topMatter: null as TopMatterFolder | null,
|
topMatter: null as TopMatterFolder | null,
|
||||||
recursive: false
|
recursive: false,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -109,13 +113,13 @@ export default defineComponent({
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
this.recursive = this.$route.query.recursive === '1'
|
this.recursive = this.$route.query.recursive === "1";
|
||||||
} else {
|
} else {
|
||||||
this.topMatter = null;
|
this.topMatter = null;
|
||||||
this.recursive = false;
|
this.recursive = false;
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -134,6 +138,10 @@ export default defineComponent({
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:deep span {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue