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
79755f36
Commit
79755f36
authored
4 years ago
by
Andy Soiron
Committed by
Tim Zallmann
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only validate service form if active
parent
80d5fccc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
app/assets/javascripts/integrations/integration_settings_form.js
...ets/javascripts/integrations/integration_settings_form.js
+4
-2
changelogs/unreleased/frontend-validate-only-active-project-services.yml
...leased/frontend-validate-only-active-project-services.yml
+5
-0
No files found.
app/assets/javascripts/integrations/integration_settings_form.js
View file @
79755f36
...
@@ -35,12 +35,14 @@ export default class IntegrationSettingsForm {
...
@@ -35,12 +35,14 @@ export default class IntegrationSettingsForm {
}
}
saveIntegration
()
{
saveIntegration
()
{
// S
ervice was marked active so now we check
;
// S
ave Service if not active and check the following if active
;
// 1) If form contents are valid
// 1) If form contents are valid
// 2) If this service can be saved
// 2) If this service can be saved
// If both conditions are true, we override form submission
// If both conditions are true, we override form submission
// and save the service using provided configuration.
// and save the service using provided configuration.
if
(
this
.
$form
.
get
(
0
).
checkValidity
())
{
const
formValid
=
this
.
$form
.
get
(
0
).
checkValidity
()
||
this
.
formActive
===
false
;
if
(
formValid
)
{
this
.
$form
.
submit
();
this
.
$form
.
submit
();
}
else
{
}
else
{
eventHub
.
$emit
(
'
validateForm
'
);
eventHub
.
$emit
(
'
validateForm
'
);
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/frontend-validate-only-active-project-services.yml
0 → 100644
View file @
79755f36
---
title
:
Fix project integration form validation when integration is inactive
merge_request
:
47201
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
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