Skip to content
Snippets Groups Projects
Commit 07cffcd6 authored by srosse's avatar srosse
Browse files

OO-3170: fix selenium tests who change the course details

parent 0ad2dad5
No related branches found
No related tags found
No related merge requests found
...@@ -220,6 +220,7 @@ public class RepositoryEditDescriptionController extends FormBasicController { ...@@ -220,6 +220,7 @@ public class RepositoryEditDescriptionController extends FormBasicController {
licenseEl = uifactory.addDropdownSingleselect("cif.license", formLayout, licenseEl = uifactory.addDropdownSingleselect("cif.license", formLayout,
licenseSelectionConfig.getLicenseTypeKeys(), licenseSelectionConfig.getLicenseTypeKeys(),
licenseSelectionConfig.getLicenseTypeValues(getLocale())); licenseSelectionConfig.getLicenseTypeValues(getLocale()));
licenseEl.setElementCssClass("o_sel_repo_license");
licenseEl.setMandatory(licenseSelectionConfig.isLicenseMandatory()); licenseEl.setMandatory(licenseSelectionConfig.isLicenseMandatory());
if (licenseSelectionConfig.getSelectionLicenseTypeKey() != null) { if (licenseSelectionConfig.getSelectionLicenseTypeKey() != null) {
licenseEl.select(licenseSelectionConfig.getSelectionLicenseTypeKey(), true); licenseEl.select(licenseSelectionConfig.getSelectionLicenseTypeKey(), true);
...@@ -435,8 +436,9 @@ public class RepositoryEditDescriptionController extends FormBasicController { ...@@ -435,8 +436,9 @@ public class RepositoryEditDescriptionController extends FormBasicController {
@Override @Override
protected boolean validateFormLogic(UserRequest ureq) { protected boolean validateFormLogic(UserRequest ureq) {
boolean allOk = super.validateFormLogic(ureq);
// Check for empty display name // Check for empty display name
boolean allOk = true;
if (!StringHelper.containsNonWhitespace(displayName.getValue())) { if (!StringHelper.containsNonWhitespace(displayName.getValue())) {
displayName.setErrorKey("cif.error.displayname.empty", new String[] {}); displayName.setErrorKey("cif.error.displayname.empty", new String[] {});
allOk = false; allOk = false;
...@@ -465,13 +467,15 @@ public class RepositoryEditDescriptionController extends FormBasicController { ...@@ -465,13 +467,15 @@ public class RepositoryEditDescriptionController extends FormBasicController {
} }
} }
licenseEl.clearError(); if(licenseEl != null) {
if (licenseEl != null && licenseEl.isMandatory() && isLicenseTypeNotSelected()) { licenseEl.clearError();
licenseEl.setErrorKey("form.legende.mandatory", null); if (licenseEl.isMandatory() && isLicenseTypeNotSelected()) {
allOk &= false; licenseEl.setErrorKey("form.legende.mandatory", null);
allOk &= false;
}
} }
return allOk & super.validateFormLogic(ureq); return allOk;
} }
private boolean isLicenseTypeNotSelected() { private boolean isLicenseTypeNotSelected() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment