style: apply lint
parent
ea289c4f02
commit
750636de67
|
@ -99,8 +99,7 @@ trait TimelineQueryDays
|
|||
bool $recursive,
|
||||
bool $archive,
|
||||
array $queryTransforms = []
|
||||
): array
|
||||
{
|
||||
): array {
|
||||
$query = $this->connection->getQueryBuilder();
|
||||
|
||||
// Get all entries also present in filecache
|
||||
|
@ -145,8 +144,7 @@ trait TimelineQueryDays
|
|||
bool $recursive,
|
||||
bool $archive,
|
||||
array $queryTransforms = []
|
||||
): array
|
||||
{
|
||||
): array {
|
||||
$query = $this->connection->getQueryBuilder();
|
||||
|
||||
// Get all entries also present in filecache
|
||||
|
@ -261,7 +259,7 @@ trait TimelineQueryDays
|
|||
$actualPath[1] = $actualPath[2];
|
||||
$actualPath[2] = $tmp;
|
||||
$davPath = implode('/', $actualPath);
|
||||
$davPaths[$fileid] = Exif::removeExtraSlash('/' . $davPath . '/');
|
||||
$davPaths[$fileid] = Exif::removeExtraSlash('/'.$davPath.'/');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -294,7 +292,7 @@ trait TimelineQueryDays
|
|||
|
||||
if (0 === strpos($row['path'], $basePath)) {
|
||||
$rpath = substr($row['path'], \strlen($basePath));
|
||||
$row['filename'] = Exif::removeExtraSlash($davPath . $rpath);
|
||||
$row['filename'] = Exif::removeExtraSlash($davPath.$rpath);
|
||||
}
|
||||
|
||||
unset($row['path']);
|
||||
|
@ -324,7 +322,7 @@ trait TimelineQueryDays
|
|||
|
||||
// Add WITH clause if needed
|
||||
if (false !== strpos($sql, 'cte_folders')) {
|
||||
$sql = $CTE_SQL . ' ' . $sql;
|
||||
$sql = $CTE_SQL.' '.$sql;
|
||||
}
|
||||
|
||||
return $this->connection->executeQuery($sql, $params, $types);
|
||||
|
@ -337,8 +335,7 @@ trait TimelineQueryDays
|
|||
IQueryBuilder &$query,
|
||||
TimelineRoot &$root,
|
||||
bool $archive
|
||||
)
|
||||
{
|
||||
) {
|
||||
// Add query parameters
|
||||
$query->setParameter('topFolderIds', $root->getIds(), IQueryBuilder::PARAM_INT_ARRAY);
|
||||
$query->setParameter('cteFoldersArchive', $archive, IQueryBuilder::PARAM_BOOL);
|
||||
|
@ -357,8 +354,7 @@ trait TimelineQueryDays
|
|||
TimelineRoot &$root,
|
||||
bool $recursive,
|
||||
bool $archive
|
||||
)
|
||||
{
|
||||
) {
|
||||
// Join with memories
|
||||
$baseOp = $query->expr()->eq('f.fileid', 'm.fileid');
|
||||
if ($root->isEmpty()) {
|
||||
|
|
18
src/App.vue
18
src/App.vue
|
@ -1,13 +1,23 @@
|
|||
<template>
|
||||
<FirstStart v-if="isFirstStart" />
|
||||
|
||||
<NcContent app-name="memories" v-else :class="{
|
||||
<NcContent
|
||||
app-name="memories"
|
||||
v-else
|
||||
:class="{
|
||||
'remove-gap': removeOuterGap,
|
||||
}">
|
||||
}"
|
||||
>
|
||||
<NcAppNavigation v-if="showNavigation" ref="nav">
|
||||
<template id="app-memories-navigation" #list>
|
||||
<NcAppNavigationItem v-for="item in navItems" :key="item.name" :to="{ name: item.name }" :title="item.title"
|
||||
@click="linkClick" exact>
|
||||
<NcAppNavigationItem
|
||||
v-for="item in navItems"
|
||||
:key="item.name"
|
||||
:to="{ name: item.name }"
|
||||
:title="item.title"
|
||||
@click="linkClick"
|
||||
exact
|
||||
>
|
||||
<component :is="item.icon" slot="icon" :size="20" />
|
||||
</NcAppNavigationItem>
|
||||
</template>
|
||||
|
|
Loading…
Reference in New Issue