rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update error message for resource quota 

https://github.com/rancher/rancher/issues/14854
This commit is contained in:
loganhz 2018-09-17 10:16:16 +08:00
parent 16ae9486e2
commit 0f61f17d99
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/container.js
View File

@ -54,16 +54,16 @@ var Container = Resource.extend(DisplayImage, {
} = projectLimit; } = projectLimit;
if ( limitsCpu && !get(this, `resources.limits.cpu`)) { if ( limitsCpu && !get(this, `resources.limits.cpu`)) {
errors.push(intl.t('validation.required', { key: intl.t('formResourceQuota.resources.limitsCpu') })); errors.push(intl.t('newContainer.errors.quotaRequired', { key: intl.t('formResourceQuota.resources.limitsCpu') }));
} }
if ( limitsMemory && !get(this, `resources.limits.memory`)) { if ( limitsMemory && !get(this, `resources.limits.memory`)) {
errors.push(intl.t('validation.required', { key: intl.t('formResourceQuota.resources.limitsMemory') })); errors.push(intl.t('newContainer.errors.quotaRequired', { key: intl.t('formResourceQuota.resources.limitsMemory') }));
} }
if ( requestsCpu && !get(this, `resources.requests.cpu`)) { if ( requestsCpu && !get(this, `resources.requests.cpu`)) {
errors.push(intl.t('validation.required', { key: intl.t('formResourceQuota.resources.requestsCpu') })); errors.push(intl.t('newContainer.errors.quotaRequired', { key: intl.t('formResourceQuota.resources.requestsCpu') }));
} }
if ( requestsMemory && !get(this, `resources.requests.memory`)) { if ( requestsMemory && !get(this, `resources.requests.memory`)) {
errors.push(intl.t('validation.required', { key: intl.t('formResourceQuota.resources.requestsMemory') })); errors.push(intl.t('newContainer.errors.quotaRequired', { key: intl.t('formResourceQuota.resources.requestsMemory') }));
} }
return errors; return errors;

1
translations/en-us.yaml
View File

@ -4751,6 +4751,7 @@ newContainer:
errors: errors:
noSidekick: Choose a workload to add the sidecar to noSidekick: Choose a workload to add the sidecar to
duplicateName: 'There is already a sidecar named "{name}" in the workload "{service}"' duplicateName: 'There is already a sidecar named "{name}" in the workload "{service}"'
quotaRequired: '"{key}" is required as resource quota is enforced on the project'
newPassword: newPassword:
placeholder: New Password placeholder: New Password