Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

98197: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98079: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97973: Merged NESS/4.2.N-2015-02-10 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            97883: 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 js condition to display a friendly error message in alfresco.js
            97924: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-03-02 12:08:20 +00:00
parent 46a73e07e5
commit 28eca9cea1
2 changed files with 10 additions and 0 deletions

View File

@@ -229,3 +229,5 @@ 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.