inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)

Browse Source 
115569 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113040 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         112938 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112693 nsmintanca: Merged NESS/4.2.N-2015-09-17 (4.2.6) to V4.2-BUG-FIX (4.2.6)
               112598: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more
                  - added check on task status in workflow/TaskFormPersister.java;
                  - added localization for the error message in workflow/workflow-messages.properties;
                  - added condition to display a friendly error message in alfresco.js
                  - referenced  current object to access its properties in task-edit-header.js
                  - added noCache parameter to the URL to ensure that requests are always made to the server to update data at back action in data-loader.js


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-10-30 00:18:06 +00:00
parent 77434f1795
commit 113f170a22
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/workflow/workflow-messages.properties
View File

@@ -229,3 +229,4 @@ listconstraint.wf_reviewOutcomeOptions.Reject=Reject
workflowtask.outcome.Approve=Approved
workflowtask.outcome.Reject=Rejected
workflowtask.already.done.error=This task has already been completed and is no longer editable.