wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-14 04:08:19 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix automation (#4531)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2024-02-05 20:36:50 +06:00 committed by GitHub
parent 5d945aedc1
commit 1b4a574a1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server-plugins/contact-resources/src/index.ts
View File

@ -19,16 +19,15 @@ import contact, {
Contact, Contact,
Organization, Organization,
Person, Person,
contactId,
getName,
formatContactName,
PersonAccount, PersonAccount,
contactId,
formatContactName,
formatName, formatName,
getLastName,
getFirstName, getFirstName,
Employee getLastName,
getName
} from '@hcengineering/contact' } from '@hcengineering/contact'
import { Ref, Class, Doc, Tx, TxRemoveDoc, TxUpdateDoc, concatLink, Hierarchy } from '@hcengineering/core' import { Class, Doc, Hierarchy, Ref, Tx, TxRemoveDoc, TxUpdateDoc, concatLink } from '@hcengineering/core'
import notification, { Collaborators } from '@hcengineering/notification' import notification, { Collaborators } from '@hcengineering/notification'
import { getMetadata } from '@hcengineering/platform' import { getMetadata } from '@hcengineering/platform'
import serverCore, { TriggerControl } from '@hcengineering/server-core' import serverCore, { TriggerControl } from '@hcengineering/server-core'
@ -204,9 +203,9 @@ export async function getCurrentEmployeePosition (
_id: control.txFactory.account as Ref<PersonAccount> _id: control.txFactory.account as Ref<PersonAccount>
}) })
if (account === undefined) return '' if (account === undefined) return ''
const employee = (await control.findAll(contact.mixin.Employee, { _id: account.person as Ref<Employee> }))[0] const employee = (await control.findAll(contact.class.Person, { _id: account.person }))[0]
if (employee !== undefined) { if (employee !== undefined) {
return employee.position ?? '' return control.hierarchy.as(employee, contact.mixin.Employee)?.position ?? ''
} }
} }

4
server-plugins/setting-resources/src/index.ts
View File

@ -97,8 +97,8 @@ export default async () => ({
IntegrationHTMLPresenter: integrationHTMLPresenter, IntegrationHTMLPresenter: integrationHTMLPresenter,
IntegrationTextPresenter: integrationTextPresenter, IntegrationTextPresenter: integrationTextPresenter,
GetValue: getValue, GetValue: getValue,
GetFirstName: getFirstName, GetFirstName: getOwnerFirstName,
GetLastName: getLastName, GetLastName: getOwnerLastName,
GetOwnerPosition: getOwnerPosition GetOwnerPosition: getOwnerPosition
} }
}) })