Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
16f6ac19
Commit
16f6ac19
authored
Jul 13, 2021
by
Siddharth Asthana
Committed by
Olena Horal-Koretska
Jul 13, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve inline error message for elapsed time field in policy model
parent
1effe4bc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
ee/app/assets/javascripts/escalation_policies/components/escalation_rule.vue
...cripts/escalation_policies/components/escalation_rule.vue
+1
-3
ee/app/assets/javascripts/escalation_policies/utils.js
ee/app/assets/javascripts/escalation_policies/utils.js
+2
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
ee/app/assets/javascripts/escalation_policies/components/escalation_rule.vue
View file @
16f6ac19
...
...
@@ -26,9 +26,7 @@ export const i18n = {
emptyScheduleValidationMsg
:
s__
(
'
EscalationPolicies|A schedule is required for adding an escalation policy.
'
,
),
invalidTimeValidationMsg
:
s__
(
'
EscalationPolicies|Elapsed time must be greater than or equal to zero.
'
,
),
invalidTimeValidationMsg
:
s__
(
'
EscalationPolicies|Minutes must be between 0 and 1440.
'
),
},
},
};
...
...
ee/app/assets/javascripts/escalation_policies/utils.js
View file @
16f6ac19
...
...
@@ -16,8 +16,9 @@ export const isNameFieldValid = (name) => {
*/
export
const
getRulesValidationState
=
(
rules
)
=>
{
return
rules
.
map
((
rule
)
=>
{
const
minutes
=
parseInt
(
rule
.
elapsedTimeMinutes
,
10
);
return
{
isTimeValid
:
parseInt
(
rule
.
elapsedTimeMinutes
,
10
)
>=
0
,
isTimeValid
:
minutes
>=
0
&&
minutes
<=
144
0
,
isScheduleValid
:
Boolean
(
rule
.
oncallScheduleIid
),
};
});
...
...
locale/gitlab.pot
View file @
16f6ac19
...
...
@@ -13075,9 +13075,6 @@ msgstr ""
msgid "EscalationPolicies|Edit escalation policy"
msgstr ""
msgid "EscalationPolicies|Elapsed time must be greater than or equal to zero."
msgstr ""
msgid "EscalationPolicies|Email on-call user in schedule"
msgstr ""
...
...
@@ -13096,6 +13093,9 @@ msgstr ""
msgid "EscalationPolicies|IF alert is not %{alertStatus} in %{minutes} minutes"
msgstr ""
msgid "EscalationPolicies|Minutes must be between 0 and 1440."
msgstr ""
msgid "EscalationPolicies|Remove escalation rule"
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment