mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 05:28:59 +01:00 
			
		
		
		
	Merge branch 'feature/typescript_backend_6' into feature/typescript_backend_7
This commit is contained in:
		
						commit
						d8c2ba0ed8
					
				@ -137,10 +137,7 @@ export default class Becca {
 | 
			
		||||
        return branch;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    getAttribute(attributeId: string | null): BAttribute | null {
 | 
			
		||||
        if (!attributeId) {
 | 
			
		||||
            return null;
 | 
			
		||||
        }
 | 
			
		||||
    getAttribute(attributeId: string): BAttribute | null {
 | 
			
		||||
        return this.attributes[attributeId];
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -208,7 +208,7 @@ function createRelation(req: Request) {
 | 
			
		||||
    const targetNoteId = req.params.targetNoteId;
 | 
			
		||||
    const name = req.params.name;
 | 
			
		||||
 | 
			
		||||
    const attributeId = sql.getValue<string | null>(`SELECT attributeId FROM attributes WHERE isDeleted = 0 AND noteId = ? AND type = 'relation' AND name = ? AND value = ?`, [sourceNoteId, name, targetNoteId]);
 | 
			
		||||
    const attributeId = sql.getValue<string>(`SELECT attributeId FROM attributes WHERE isDeleted = 0 AND noteId = ? AND type = 'relation' AND name = ? AND value = ?`, [sourceNoteId, name, targetNoteId]);
 | 
			
		||||
    let attribute = becca.getAttribute(attributeId);
 | 
			
		||||
 | 
			
		||||
    if (!attribute) {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user