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

Merge OpenOLAT 10.3 to OpenOLAT default branch with b7852624ddabb06517b2af268bd23620159ea70f

parents 7376e246 3429b605
No related branches found
No related tags found
No related merge requests found
......@@ -502,7 +502,7 @@ public class Table extends AbstractComponent {
}
protected void resort() {
if (isSortingEnabled()) {
if (isSortingEnabled() && sortColumn < getColumnCount()) {
ColumnDescriptor currentSortingCd = getColumnDescriptor(sortColumn); // we sort after this
// column descriptor
// notify all nonactive ColumnDescriptors about their state
......
/**
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* <p>
......@@ -123,7 +124,7 @@ public class RegistrationAdminController extends FormBasicController {
registrationLinkElement.select("on", registrationModule.isSelfRegistrationLinkEnabled());
String example = generateExampleCode();
exampleElement = uifactory.addTextAreaElement("registration.link.example", "admin.registrationLinkExample", 2000, 4, 65, true, example, settingsContainer);
exampleElement = uifactory.addTextAreaElement("registration.link.example", "admin.registrationLinkExample", 64000, 4, 65, true, example, settingsContainer);
//domain configuration
domainsContainer = FormLayoutContainer.createDefaultFormLayout("domains", getTranslator());
......@@ -133,7 +134,7 @@ public class RegistrationAdminController extends FormBasicController {
uifactory.addStaticTextElement("admin.registration.domains.error", null, translate("admin.registration.domains.desc"), domainsContainer);
String domainsList = registrationModule.getDomainListRaw();
domainListElement = uifactory.addTextAreaElement("registration.domain.list", "admin.registration.domains", 2000, 10, 65, true, domainsList, domainsContainer);
domainListElement = uifactory.addTextAreaElement("registration.domain.list", "admin.registration.domains", 64000, 10, 65, true, domainsList, domainsContainer);
//static property
staticPropContainer = FormLayoutContainer.createDefaultFormLayout("propertiesmapping", getTranslator());
......@@ -165,7 +166,7 @@ public class RegistrationAdminController extends FormBasicController {
formLayout.add(remoteLoginContainerContainer);
String remoteExample = generateRemoteLoginExampleCode();
uifactory.addTextAreaElement("remotelogin.example", "admin.registrationLinkExample", 2000, 4, 65, true, remoteExample, remoteLoginContainerContainer);
uifactory.addTextAreaElement("remotelogin.example", "admin.registrationLinkExample", 64000, 4, 65, true, remoteExample, remoteLoginContainerContainer);
FormLayoutContainer buttonGroupLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
buttonGroupLayout.setRootForm(mainForm);
......
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