Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

allow duplicated attribute per note (in effect attributes can be multi-valued). Closes #33

Browse Source
This commit is contained in:
azivner
2018-02-06 21:18:09 -05:00
parent c2a2f195aa
commit 7c74c77a2c
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
db/migrations/0072__allow_multiple_attributes_per_note.sql Normal file
View File

@@ -0,0 +1 @@
DROP INDEX IDX_attributes_noteId_name;

1
db/schema.sql
View File

@@ -118,4 +118,3 @@ CREATE INDEX IDX_note_images_noteId ON note_images (noteId);
CREATE INDEX IDX_note_images_imageId ON note_images (imageId); CREATE INDEX IDX_note_images_imageId ON note_images (imageId);
CREATE INDEX IDX_note_images_noteId_imageId ON note_images (noteId, imageId); CREATE INDEX IDX_note_images_noteId_imageId ON note_images (noteId, imageId);
CREATE INDEX IDX_attributes_noteId ON attributes (noteId); CREATE INDEX IDX_attributes_noteId ON attributes (noteId);
CREATE UNIQUE INDEX IDX_attributes_noteId_name ON attributes (noteId, name);

2
src/public/javascripts/dialogs/attributes.js
View File

@@ -28,7 +28,7 @@ const attributesDialog = (function() {
function isValid() { function isValid() {
for (let attrs = self.attributes(), i = 0; i < attrs.length; i++) { for (let attrs = self.attributes(), i = 0; i < attrs.length; i++) {
if (self.isEmptyName(i) || self.isNotUnique(i)) { if (self.isEmptyName(i)) {
return false; return false;
} }
} }

4
src/routes/api/notes.js
View File

@@ -62,6 +62,8 @@ router.get('/', auth.checkApiAuth, wrap(async (req, res, next) => {
const {query, params} = getSearchQuery(attrFilters, searchText); const {query, params} = getSearchQuery(attrFilters, searchText);
console.log(query, params);
const noteIds = await sql.getColumn(query, params); const noteIds = await sql.getColumn(query, params);
res.send(noteIds); res.send(noteIds);
@@ -152,7 +154,7 @@ function getSearchQuery(attrFilters, searchText) {
searchParams.push(searchText); // two occurences in searchCondition searchParams.push(searchText); // two occurences in searchCondition
} }
const query = `SELECT notes.noteId FROM notes const query = `SELECT DISTINCT notes.noteId FROM notes
${joins.join('\r\n')} ${joins.join('\r\n')}
WHERE WHERE
notes.isDeleted = 0 notes.isDeleted = 0

2
src/services/app_info.js
View File

@@ -3,7 +3,7 @@
const build = require('./build'); const build = require('./build');
const packageJson = require('../../package'); const packageJson = require('../../package');
const APP_DB_VERSION = 71; const APP_DB_VERSION = 72;
module.exports = { module.exports = {
app_version: packageJson.version, app_version: packageJson.version,

3
src/views/index.ejs
View File

@@ -394,8 +394,7 @@
<td> <td>
<!-- Change to valueUpdate: blur is necessary because jQuery UI autocomplete hijacks change event --> <!-- Change to valueUpdate: blur is necessary because jQuery UI autocomplete hijacks change event -->
<input type="text" class="attribute-name" data-bind="value: name, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }"/> <input type="text" class="attribute-name" data-bind="value: name, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }"/>
<div style="color: yellowgreen" data-bind="if: $parent.isNotUnique($index())"><span class="glyphicon glyphicon-info-sign"></span> Duplicate attribute.</div>
<div style="color: red" data-bind="if: $parent.isNotUnique($index())">Attribute name must be unique per note.</div>
<div style="color: red" data-bind="if: $parent.isEmptyName($index())">Attribute name can't be empty.</div> <div style="color: red" data-bind="if: $parent.isEmptyName($index())">Attribute name can't be empty.</div>
</td> </td>
<td> <td>