diff --git a/CHANGELOG b/CHANGELOG index 5fc8ee4456..7503c665fc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +v3.3.11 (2018-XX-XX) +-------------------- + +* fixed internal issue #2163: wrong labels within foxx validation of service + input parameters + + v3.3.10 (2018-06-04) -------------------- diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxInstallView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxInstallView.js index 1804e850af..fc88a409eb 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxInstallView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxInstallView.js @@ -106,7 +106,7 @@ return [ { rule: Joi.string().required().regex(/^[a-zA-Z\-_][a-zA-Z0-9\-_]*$/), - msg: "Can only contain a to z, A to Z, 0-9, '-' and '_'." + msg: "Can only contain a to z, A to Z, 0-9, '-' and '_'. Cannot start with a number." } ]; } @@ -130,7 +130,7 @@ return [ { rule: Joi.string().required().regex(/^[a-zA-Z0-9 .,;-]+$/), - msg: 'Has to be non empty.' + msg: "Can only contain a to z, A to Z, 0-9, '-', '.', ',' and ';'." } ]; } diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/installNewServiceView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/installNewServiceView.js index ddbeee788b..a996395953 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/installNewServiceView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/installNewServiceView.js @@ -126,7 +126,7 @@ return [ { rule: Joi.string().required().regex(/^[a-zA-Z\-_][a-zA-Z0-9\-_]*$/), - msg: "Can only contain a to z, A to Z, 0-9, '-' and '_'." + msg: "Can only contain a to z, A to Z, 0-9, '-' and '_'. Cannot start with a number." } ]; } @@ -150,7 +150,7 @@ return [ { rule: Joi.string().required().regex(/^[a-zA-Z0-9 .,;-]+$/), - msg: 'Has to be non empty.' + msg: "Can only contain a to z, A to Z, 0-9, '-', '.', ',' and ';'." } ]; }