YUKI Hiroshi
null+****@clear*****
Mon Nov 26 19:17:23 JST 2012
YUKI Hiroshi 2012-11-26 19:17:23 +0900 (Mon, 26 Nov 2012) New Revision: 7d0bbd7486902abe9a0b253864989979d2a5dcd5 https://github.com/groonga/gcs/commit/7d0bbd7486902abe9a0b253864989979d2a5dcd5 Log: Update original messages correctly Modified files: lib/api/2011-02-01/configuration.js Modified: lib/api/2011-02-01/configuration.js (+13 -4) =================================================================== --- lib/api/2011-02-01/configuration.js 2012-11-26 19:13:04 +0900 (0ba29a7) +++ lib/api/2011-02-01/configuration.js 2012-11-26 19:17:23 +0900 (dadea59) @@ -20,6 +20,10 @@ function handleDomanValidationError(process, variables) { NAME_FIELD: 'domainName' }; error.message = error.message.replace(/%NAME_FIELD%/g, variables.NAME_FIELD); + if (error.messages) + error.messages = error.messages.map(function(message) { + return message.replace(/%NAME_FIELD%/g, variables.NAME_FIELD); + }); } throw error; } @@ -37,6 +41,11 @@ function handleIndexFieldValidationError(process, variables) { error.message = error.message .replace(/%NAME_FIELD%/g, variables.NAME_FIELD) .replace(/%TYPE_FIELD%/g, variables.TYPE_FIELD); + if (error.messages) + error.messages = error.messages.map(function(message) { + return message.replace(/%NAME_FIELD%/g, variables.NAME_FIELD) + .replace(/%TYPE_FIELD%/g, variables.TYPE_FIELD); + }); } throw error; } @@ -323,7 +332,7 @@ handlers.DefineIndexField = function(context, request, response, config) { domain.validate(); }); } catch(error) { - if (error.isMultiplexed) + if (error.isValidationError && error.isMultiplexed) validationErrors = validationErrors.concat(error.messages); else throw error; @@ -338,7 +347,7 @@ handlers.DefineIndexField = function(context, request, response, config) { field.validate(); }); } catch(error) { - if (error.isMultiplexed) + if (error.isValidationError && error.isMultiplexed) validationErrors = validationErrors.concat(error.messages); else throw error; @@ -397,7 +406,7 @@ handlers.DeleteIndexField = function(context, request, response, config) { domain.validate(); }); } catch(error) { - if (error.isMultiplexed) + if (error.isValidationError && error.isMultiplexed) validationErrors = validationErrors.concat(error.messages); else throw error; @@ -413,7 +422,7 @@ handlers.DeleteIndexField = function(context, request, response, config) { NAME_FIELD: 'indexFieldName' }); } catch(error) { - if (error.isMultiplexed) + if (error.isValidationError && error.isMultiplexed) validationErrors = validationErrors.concat(error.messages); else throw error; -------------- next part -------------- HTML����������������������������...Download