From 2b80d45153f88f60c2c070856bc7c2c1c43f36e7 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 15 Feb 2022 05:51:20 +0100 Subject: [PATCH] Inject CMS context in order to deal with locales --- org.argeo.app.ui/OSGI-INF/loginScreen.xml | 1 + .../src/org/argeo/app/ui/DefaultLoginScreen.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/org.argeo.app.ui/OSGI-INF/loginScreen.xml b/org.argeo.app.ui/OSGI-INF/loginScreen.xml index ec7862d..f79396f 100644 --- a/org.argeo.app.ui/OSGI-INF/loginScreen.xml +++ b/org.argeo.app.ui/OSGI-INF/loginScreen.xml @@ -5,4 +5,5 @@ + diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLoginScreen.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLoginScreen.java index 0624c48..e9b466f 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLoginScreen.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLoginScreen.java @@ -3,6 +3,7 @@ package org.argeo.app.ui; import javax.jcr.Node; import javax.jcr.RepositoryException; +import org.argeo.api.cms.CmsContext; import org.argeo.api.cms.CmsView; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.swt.CmsSwtUtils; @@ -16,6 +17,7 @@ import org.eclipse.swt.widgets.Control; /** Provides a login screen. */ public class DefaultLoginScreen implements CmsUiProvider { + private CmsContext cmsContext; @Override public Control createUi(Composite parent, Node context) throws RepositoryException { @@ -26,10 +28,14 @@ public class DefaultLoginScreen implements CmsUiProvider { parent.setLayout(new GridLayout()); Composite loginArea = new Composite(parent, SWT.NONE); loginArea.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true)); - - CmsLogin cmsLogin = new CmsLogin(cmsView); + + CmsLogin cmsLogin = new CmsLogin(cmsView, cmsContext); cmsLogin.createUi(loginArea); return cmsLogin.getCredentialsBlock(); } + public void setCmsContext(CmsContext cmsContext) { + this.cmsContext = cmsContext; + } + } -- 2.30.2