Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:ProcessMaker/processmaker into F…
Browse files Browse the repository at this point in the history
…OUR-13944
  • Loading branch information
marcoAntonioNina committed Feb 29, 2024
2 parents ecafa54 + 6ecd927 commit 4ccd475
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 17 deletions.
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "processmaker/processmaker",
"version": "4.9.2",
"version": "4.9.3+nightly-20240228",
"description": "BPM PHP Software",
"keywords": [
"php bpm processmaker"
Expand Down Expand Up @@ -102,9 +102,9 @@
"Gmail"
],
"processmaker": {
"build": "ebfefbd2",
"build": "2d34d3a2",
"custom": {
"package-ellucian-ethos": "1.15.3",
"package-ellucian-ethos": "1.15.5",
"package-plaid": "1.5.0",
"paypal-package": "dev-fall",
"pps-adsync": "dev-fall",
Expand Down Expand Up @@ -141,7 +141,7 @@
"docker-executor-node-ssr": "1.5.0",
"package-actions-by-email": "1.16.0",
"package-advanced-user-manager": "1.10.0",
"package-ai": "1.5.2",
"package-ai": "1.5.3",
"package-analytics-reporting": "1.5.1",
"package-auth": "1.17.1",
"package-cdata": "1.2.0",
Expand All @@ -156,15 +156,15 @@
"package-photo-video": "1.4.2",
"package-pm-blocks": "1.5.5",
"package-process-documenter": "1.9.0",
"package-process-optimization": "1.10.0",
"package-process-optimization": "1.10.1",
"package-product-analytics": "1.5.8",
"package-projects": "1.2.5",
"package-savedsearch": "1.31.8",
"package-sentry": "1.8.0",
"package-signature": "1.12.0",
"package-testing": "1.1.1",
"package-translations": "2.8.1",
"package-versions": "1.9.1",
"package-versions": "1.9.2",
"package-vocabularies": "2.14.1",
"package-webentry": "2.20.3",
"packages": "^0"
Expand All @@ -177,7 +177,7 @@
"microservices": {
"pmai": "fall-2023"
},
"release": "Winter 2024"
"release": "Winter 2024 Pre-Release"
}
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@processmaker/processmaker",
"version": "4.9.2",
"version": "4.9.3+nightly-20240228",
"description": "ProcessMaker 4",
"author": "DevOps <[email protected]>",
"license": "ISC",
Expand Down Expand Up @@ -53,7 +53,7 @@
"@panter/vue-i18next": "^0.15.2",
"@processmaker/modeler": "1.46.11",
"@processmaker/processmaker-bpmn-moddle": "0.14.1",
"@processmaker/screen-builder": "2.83.10",
"@processmaker/screen-builder": "2.83.11",
"@processmaker/vue-form-elements": "0.51.0",
"@processmaker/vue-multiselect": "2.3.0",
"@tinymce/tinymce-vue": "2.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export default {
task: null,
currentUserId: null,
formData: {},
importingProcessTemplate: false,
};
},
methods: {
Expand Down Expand Up @@ -86,9 +87,9 @@ export default {
this.task = task;
},
completed() {
if (this.shouldImportProcessTemplate) {
if (!this.importingProcessTemplate && this.shouldImportProcessTemplate) {
this.importProcessTemplate();
} else {
} else if (this.shouldImportProcessTemplate) {
this.showHelperProcess = false;
this.$bvModal.hide("processWizard");
}
Expand All @@ -103,6 +104,7 @@ export default {
});
},
importProcessTemplate() {
this.importingProcessTemplate = true;
ProcessMaker.apiClient.post(`template/create/process/${this.template.process_template_id}`, {
name: this.template.name,
description: this.template.description,
Expand All @@ -112,6 +114,7 @@ export default {
wizardTemplateUuid: this.template.uuid,
helperProcessRequestId: this.task.process_request_id,
}).then((response) => {
this.importingProcessTemplate = false;
if (response.data?.existingAssets) {
this.handleExistingAssets(response.data);
} else {
Expand Down

0 comments on commit 4ccd475

Please sign in to comment.