Revision 53601
Added by Myrto Koukouli over 5 years ago
datasource-interface-form.component.ts | ||
---|---|---|
180 | 180 |
this.groupErrorMessage = ''; |
181 | 181 |
this.errorMessage = ''; |
182 | 182 |
this.successMessage = ''; |
183 |
if (this.group.valid && this.checkIfValsetWasChosen() && this.checkIfCompatibilityLevelWasChosen() ) { |
|
183 |
|
|
184 |
// if decided that valset is required add && this.checkIfValsetWasChosen() to the condition |
|
185 |
if (this.group.valid && this.checkIfCompatibilityLevelWasChosen() ) { |
|
184 | 186 |
if (this.identifiedBaseUrl) { |
185 | 187 |
let baseUrl = this.getMyControl('baseUrl').value; |
186 | 188 |
let valset: string = ''; |
... | ... | |
212 | 214 |
} |
213 | 215 |
|
214 | 216 |
checkIfValsetWasChosen() { |
215 |
return ( ( this.getMyControl('selectValidationSet').enabled && this.getMyControl('selectValidationSet').value !='' ) || ( this.getMyControl('customValidationSet').enabled && this.getMyControl('customValidationSet').value !='' ) ); |
|
217 |
return ( ( this.getMyControl('selectValidationSet').enabled && |
|
218 |
this.getMyControl('selectValidationSet').value !='' ) || |
|
219 |
( this.getMyControl('customValidationSet').enabled && |
|
220 |
this.getMyControl('customValidationSet').value !='' ) ); |
|
216 | 221 |
} |
217 | 222 |
|
218 | 223 |
checkIfCompatibilityLevelWasChosen() { |
... | ... | |
222 | 227 |
checkIfValid() { |
223 | 228 |
console.log(this.existingCompLevel); |
224 | 229 |
if (this.inRegister) { |
225 |
if ( this.group.valid && this.checkIfValsetWasChosen() && this.checkIfCompatibilityLevelWasChosen() ) { |
|
230 |
// if decided that valset is required add && this.checkIfValsetWasChosen() to the condition |
|
231 |
if ( this.group.valid && this.checkIfCompatibilityLevelWasChosen() ) { |
|
226 | 232 |
if ( this.identifiedBaseUrl ) { |
227 | 233 |
let baseUrl = this.getMyControl('baseUrl').value; |
228 | 234 |
|
Also available in: Unified diff
fixed some bugs