gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-01-15 11:04:30 +01:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

chore(core): address requested changes

Browse Source
This commit is contained in:
Elian Doran 2026-01-12 21:43:57 +02:00
parent 43d087f886
commit daf41804d4
No known key found for this signature in database
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/widgets/attribute_widgets/UserAttributesList.tsx
View File

@ -48,7 +48,7 @@ function useNoteAttributesWithDefinitions(note: FNote, attributesToIgnore: stri
}
function UserAttribute({ attr, children, style }: { attr: AttributeWithDefinitions, children: ComponentChildren, style?: CSSProperties }) {
const className = `${attr.type === "label" ? `label` + ` ${ attr.def.labelType}` : "relation"}`;
const className = attr.type === "label" ? `label ${attr.def.labelType}` : "relation";
return (
<span key={attr.friendlyName} className={`user-attribute type-${className}`} style={style}>

6
apps/server/package.json
View File

@ -110,7 +110,7 @@
"openai": "6.16.0",
"rand-token": "1.0.1",
"safe-compare": "1.1.4",
"sax": "1.4.3",
"sax": "1.4.4",
"serve-favicon": "2.5.1",
"stream-throttle": "0.1.3",
"strip-bom": "5.0.0",
@ -120,8 +120,8 @@
"time2fa": "1.4.2",
"tmp": "0.2.5",
"turndown": "7.2.2",
"vite": "7.3.0",
"ws": "8.18.3",
"vite": "7.3.1",
"ws": "8.19.0",
"xml2js": "0.6.2",
"yauzl": "3.2.0"
}

2
packages/trilium-core/src/becca/entities/bnote.ts
View File

@ -1602,7 +1602,7 @@ class BNote extends AbstractBeccaEntity<BNote> {
// Limit the number of Snapshots to revisionSnapshotNumberLimit
// Delete older Snapshots that exceed the limit
eraseExcessRevisionSnapshots() {
// lable has a higher priority
// label has a higher priority
let revisionSnapshotNumberLimit = parseInt(this.getLabelValue("versioningLimit") ?? "");
if (!Number.isInteger(revisionSnapshotNumberLimit)) {
revisionSnapshotNumberLimit = parseInt(optionService.getOption("revisionSnapshotNumberLimit"));

4
packages/trilium-core/src/services/log.ts
View File

@ -5,11 +5,11 @@ export default class LogService {
}
info(message: string | Error) {
this.log(message);
console.info(message);
}
error(message: string | Error | unknown) {
this.log(`ERROR: ${message}`);
console.error("ERROR: ", message);
}
}

2
packages/trilium-core/src/services/notes.ts
View File

@ -553,7 +553,7 @@ async function downloadImage(noteId: string, imageUrl: string) {
if (attachment.attachmentId) {
imageUrlToAttachmentIdMapping[imageUrl] = attachment.attachmentId;
} else {
log.error(`Download of '${imageUrl}' due to no attachment ID.`);
log.error(`Download of '${imageUrl}' for note '${noteId}' failed due to no attachment ID.`);
}
log.info(`Download of '${imageUrl}' succeeded and was saved as image attachment '${attachment.attachmentId}' of note '${noteId}'`);

2
packages/trilium-core/src/services/options_init.ts
View File

@ -28,7 +28,7 @@ interface DefaultOption {
/**
* The value to initialize the option with, if the option is not already present in the database.
*
* If a function is passed Gin instead, the function is called if the option does not exist (with access to the current options) and the return value is used instead. Useful to migrate a new option with a value depending on some other option that might be initialized.
* If a function is passed in instead, the function is called if the option does not exist (with access to the current options) and the return value is used instead. Useful to migrate a new option with a value depending on some other option that might be initialized.
*/
value: string | ((options: OptionMap) => string);
isSynced: boolean;