RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tab -> Space

pull/363/head
Varun Patil 2023-01-20 10:50:48 -08:00
parent 2f38074e4c
commit 0fae4d1ba9
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
appinfo/info.xml
View File

@ -55,12 +55,12 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
<route>memories.Page.main</route> <route>memories.Page.main</route>
</navigation> </navigation>
</navigations> </navigations>
<repair-steps> <repair-steps>
<post-migration> <post-migration>
<step>OCA\Memories\Migration\Repair</step> <step>OCA\Memories\Migration\Repair</step>
</post-migration> </post-migration>
<install> <install>
<step>OCA\Memories\Migration\Repair</step> <step>OCA\Memories\Migration\Repair</step>
</install> </install>
</repair-steps> </repair-steps>
</info> </info>

24
babel.config.js
View File

@ -1,15 +1,15 @@
module.exports = { module.exports = {
plugins: [ plugins: [
'@babel/plugin-syntax-dynamic-import', '@babel/plugin-syntax-dynamic-import',
], ],
presets: [ presets: [
[ [
'@babel/preset-env', '@babel/preset-env',
{ {
"targets": "> 5%, not dead", "targets": "> 5%, not dead",
useBuiltIns: false, useBuiltIns: false,
modules: 'auto', modules: 'auto',
}, },
], ],
], ],
} }

8
lib/Db/TimelineQueryDays.php
View File

@ -31,11 +31,11 @@ const CTE_FOLDERS = // CTE to get all folders recursively in the given top folde
), *PREFIX*cte_folders AS ( ), *PREFIX*cte_folders AS (
SELECT SELECT
fileid, fileid,
MIN(rootid) AS rootid MIN(rootid) AS rootid
FROM FROM
*PREFIX*cte_folders_all *PREFIX*cte_folders_all
GROUP BY GROUP BY
fileid fileid
)'; )';
const CTE_FOLDERS_ARCHIVE = // CTE to get all archive folders recursively in the given top folders const CTE_FOLDERS_ARCHIVE = // CTE to get all archive folders recursively in the given top folders
@ -317,8 +317,8 @@ trait TimelineQueryDays
// Get SQL // Get SQL
$CTE_SQL = \array_key_exists('cteFoldersArchive', $params) && $params['cteFoldersArchive'] $CTE_SQL = \array_key_exists('cteFoldersArchive', $params) && $params['cteFoldersArchive']
? CTE_FOLDERS_ARCHIVE ? CTE_FOLDERS_ARCHIVE
: CTE_FOLDERS; : CTE_FOLDERS;
// Add WITH clause if needed // Add WITH clause if needed
if (false !== strpos($sql, 'cte_folders')) { if (false !== strpos($sql, 'cte_folders')) {