Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 11:56:01 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into next61

Browse Source
This commit is contained in:
zadam
2023-07-15 11:27:42 +02:00
parent 1a7c2d4c32 d153fc7ba5
commit 8465d7fa68
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/services/promoted_attribute_definition_parser.js
View File

@@ -6,7 +6,7 @@ function parse(value) {
if (token === 'promoted') {
defObj.isPromoted = true;
}
else if (['text', 'number', 'boolean', 'date', 'url'].includes(token)) {
else if (['text', 'number', 'boolean', 'date', 'datetime', 'url'].includes(token)) {
defObj.labelType = token;
}
else if (['single', 'multi'].includes(token)) {

1
src/public/app/widgets/attribute_widgets/attribute_detail.js
View File

@@ -115,6 +115,7 @@ const TPL = `
<option value="number">Number</option>
<option value="boolean">Boolean</option>
<option value="date">Date</option>
<option value="datetime">Datetime</option>
<option value="url">URL</option>
</select>
</td>

3
src/public/app/widgets/ribbon_widgets/promoted_attributes.js
View File

@@ -197,6 +197,9 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget {
else if (definition.labelType === 'date') {
$input.prop("type", "date");
}
else if (definition.labelType === 'datetime') {
$input.prop('type', 'datetime-local')
}
else if (definition.labelType === 'url') {
$input.prop("placeholder", "http://website...");