WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-09-13 13:17:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into react-tour

Browse Source
This commit is contained in:
RaktimaNXG
2024-09-30 12:35:11 +05:30
parent 088ec5580a 63b2693fe0
commit 66a56757d1
23 changed files with 259 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
+3 -2
View File
@@ -196,8 +196,9 @@ export default async function createDocumentWithTemplate(request, response) {
if (TimeToCompleteDays) {
object.set('TimeToCompleteDays', TimeToCompleteDays);
}
const enableOTP = request.body?.enableOTP === true ? true : false;
const IsEnableOTP = enableOTP || template?.IsEnableOTP || false;
const enableOTP = request.body?.enableOTP;
const IsEnableOTP =
enableOTP !== undefined ? enableOTP : template?.IsEnableOTP || false;
const enableTour = request.body?.enableOTP;
const isTourEnabled =
enableTour !== undefined ? enableTour : template?.IsTourEnabled || false;
apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js
+1 -1
View File
@@ -48,7 +48,7 @@ export default async function updateDocument(request, response) {
objectId: request?.body?.folderId,
});
}
if (request.body?.enableOTP) {
if (request.body?.enableOTP !== undefined) {
updateQuery.set('IsEnableOTP', request.body?.enableOTP);
}
if (request.body?.enableTour !== undefined) {
apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js
+1 -1
View File
@@ -48,7 +48,7 @@ export default async function updateTemplate(request, response) {
objectId: request?.body?.folderId,
});
}
if (request.body?.enableOTP) {
if (request.body?.enableOTP !== undefined) {
updateQuery.set('IsEnableOTP', request.body?.enableOTP);
}
if (request.body?.enableTour !== undefined) {
apps/OpenSignServer/cloud/parsefunction/UpdateExistUserAsAdmin.js
+4 -1
View File
@@ -51,7 +51,10 @@ export default async function UpdateExistUserAsAdmin(request) {
extClsQuery.notEqualTo('IsDisabled', true);
const extAdminRes = await extClsQuery.find({ useMasterKey: true });
if (extAdminRes && extAdminRes.length === 1 && extAdminRes?.[0]?.get('OrganizationId')) {
throw new Parse.Error(Parse.Error.DUPLICATE_VALUE, 'Admin already exist.');
throw new Parse.Error(
Parse.Error.DUPLICATE_VALUE,
'Admin already exists. Please login to the application using admin credentials in order to manage users.'
);
} else {
const extCls = new Parse.Query('contracts_Users');
extCls.equalTo('Email', email);