Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-25 16:19:46 +02:00
Code Releases Activity

Replace folderId with spaceId

Browse source
This commit is contained in:
sauls8t 2018-10-23 13:47:13 +01:00
parent 313ed7f90a
commit 150f86025b
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gui/app/services/link.js
View file

@ -63,15 +63,15 @@ export default Service.extend(Notifier, {
if (link.linkType === "section" || link.linkType === "tab" || link.linkType === "document") { if (link.linkType === "section" || link.linkType === "tab" || link.linkType === "document") {
href = `/link/${link.linkType}/${link.id}`; href = `/link/${link.linkType}/${link.id}`;
result = `<a data-documize='true' data-link-space-id='${link.folderId}' data-link-id='${link.id}' data-link-target-document-id='${link.documentId}' data-link-target-id='${link.targetId}' data-link-type='${link.linkType}' href='${href}'>${link.title}</a>`; result = `<a data-documize='true' data-link-space-id='${link.spaceId}' data-link-id='${link.id}' data-link-target-document-id='${link.documentId}' data-link-target-id='${link.targetId}' data-link-type='${link.linkType}' href='${href}'>${link.title}</a>`;
} }
if (link.linkType === "file") { if (link.linkType === "file") {
href = `${endpoint}/public/attachments/${orgId}/${link.targetId}`; href = `${endpoint}/public/attachments/${orgId}/${link.targetId}`;
result = `<a data-documize='true' data-link-space-id='${link.folderId}' data-link-id='${link.id}' data-link-target-document-id='${link.documentId}' data-link-target-id='${link.targetId}' data-link-type='${link.linkType}' href='${href}'>${link.title}</a>`; result = `<a data-documize='true' data-link-space-id='${link.spaceId}' data-link-id='${link.id}' data-link-target-document-id='${link.documentId}' data-link-target-id='${link.targetId}' data-link-type='${link.linkType}' href='${href}'>${link.title}</a>`;
} }
if (link.linkType === "network") { if (link.linkType === "network") {
href = `fileto://${link.externalId}`; href = `fileto://${link.externalId}`;
result = `<a data-documize='true' data-link-space-id='${link.folderId}' data-link-id='${link.id}' data-link-target-document-id='${link.documentId}' data-link-target-id='${link.targetId}' data-link-external-id='${link.externalId}' data-link-type='${link.linkType}' href='${href}'>${link.title}</a>`; result = `<a data-documize='true' data-link-space-id='${link.spaceId}' data-link-id='${link.id}' data-link-target-document-id='${link.documentId}' data-link-target-id='${link.targetId}' data-link-external-id='${link.externalId}' data-link-type='${link.linkType}' href='${href}'>${link.title}</a>`;
} }
return result; return result;
@ -89,7 +89,7 @@ export default Service.extend(Notifier, {
orphan: false orphan: false
}; };
link.orphan = _.isEmpty(link.linkId) || _.isEmpty(link.documentId) || _.isEmpty(link.folderId) || (_.isEmpty(link.targetId) && _.isEmpty(link.externalId)); link.orphan = _.isEmpty(link.linkId) || _.isEmpty(link.documentId) || _.isEmpty(link.spaceId) || (_.isEmpty(link.targetId) && _.isEmpty(link.externalId));
// we check latest state of link using database data // we check latest state of link using database data
let existing = outboundLinks.findBy('id', link.linkId); let existing = outboundLinks.findBy('id', link.linkId);
@ -109,7 +109,7 @@ export default Service.extend(Notifier, {
} }
let router = this.get('router'); let router = this.get('router');
let targetFolder = this.get('store').peekRecord('folder', link.folderId); let targetFolder = this.get('store').peekRecord('folder', link.spaceId);
let targetDocument = this.get('store').peekRecord('document', link.documentId); let targetDocument = this.get('store').peekRecord('document', link.documentId);
let folderSlug = is.null(targetFolder) ? "s" : targetFolder.get('slug'); let folderSlug = is.null(targetFolder) ? "s" : targetFolder.get('slug');
let documentSlug = is.null(targetDocument) ? "d" : targetDocument.get('slug'); let documentSlug = is.null(targetDocument) ? "d" : targetDocument.get('slug');
@ -118,13 +118,13 @@ export default Service.extend(Notifier, {
if (link.linkType === "section" || link.linkType === "tab") { if (link.linkType === "section" || link.linkType === "tab") {
let options = {}; let options = {};
options['pageId'] = link.targetId; options['pageId'] = link.targetId;
router.transitionTo('document', link.folderId, folderSlug, link.documentId, documentSlug, { queryParams: options }); router.transitionTo('document', link.spaceId, folderSlug, link.documentId, documentSlug, { queryParams: options });
return; return;
} }
// handle document link // handle document link
if (link.linkType === "document") { if (link.linkType === "document") {
router.transitionTo('document', link.folderId, folderSlug, link.documentId, documentSlug); router.transitionTo('document', link.spaceId, folderSlug, link.documentId, documentSlug);
return; return;
} }