Merge branch 'release-2024-summer' into bugfix/FOUR-19799

Author: sanjacornelius

.github/workflows/ci.yml

@@ -25,9 +25,6 @@ jobs:
       - name: set-vfe-branch
         run: |
           export VFE_BRANCH=''
-          if [[ ${{ contains(github.event.pull_request.body, 'ci:next') }} ]]; then
-            export VFE_BRANCH=next
-          fi
           if [[ "${{ steps.install-vfe.outputs.match }}" != "" ]]; then
             export VFE_BRANCH=${{ steps.install-vfe.outputs.group1 }}
           fi

src/components/renderer/file-upload.vue

@@ -533,6 +533,10 @@ export default {
       }
 
       if (displayMessage.length > 0) {
+        const data = JSON.parse(displayMessage);
+        if (data.message) {
+          displayMessage = data.message;
+        }
         window.ProcessMaker.alert(`${this.$t('File Upload Error:')}  ${displayMessage}`, 'danger');
       }