midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test and integrated Rev:10311 to Trunk 

http://adempiere.svn.sourceforge.net/viewvc/adempiere?view=rev&revision=10311

Fix [2846601] - DB.isDatabaseOK() is not called
https://sourceforge.net/tracker/index.php?func=detail&aid=2846601&group_id=176962&atid=955896
This commit is contained in:
tspc 2009-10-04 10:48:03 +00:00
parent bc7e57b24e
commit aaa62f6298
1 changed files with 353 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

690
zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
View File

@ -1,337 +1,353 @@
/****************************************************************************** /******************************************************************************
* Product: Posterita Ajax UI * * Product: Posterita Ajax UI *
* Copyright (C) 2007 Posterita Ltd. All Rights Reserved. * * Copyright (C) 2007 Posterita Ltd. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published * * under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope * * by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. * * See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., * * with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
* For the text or an alternative of this public license, you may reach us * * For the text or an alternative of this public license, you may reach us *
* Posterita Ltd., 3, Draper Avenue, Quatre Bornes, Mauritius * * Posterita Ltd., 3, Draper Avenue, Quatre Bornes, Mauritius *
* or via info@posterita.org or http://www.posterita.org/ * * or via info@posterita.org or http://www.posterita.org/ *
* * * *
* Contributors: * * Contributors: *
* - Heng Sin Low * * - Heng Sin Low *
* * * *
* Sponsors: * * Sponsors: *
* - Idalica Corporation * * - Idalica Corporation *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.panel; package org.adempiere.webui.panel;
import java.util.Properties; import java.text.MessageFormat;
import java.util.ResourceBundle; import java.util.Properties;
import java.util.ResourceBundle;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.Combobox; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.Combobox;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Textbox; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Textbox;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.component.Window;
import org.adempiere.webui.theme.ITheme; import org.adempiere.webui.exception.ApplicationException;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.UserPreference; import org.adempiere.webui.theme.ITheme;
import org.adempiere.webui.window.LoginWindow; import org.adempiere.webui.theme.ThemeManager;
import org.compiere.util.DB; import org.adempiere.webui.util.UserPreference;
import org.compiere.util.Env; import org.adempiere.webui.window.LoginWindow;
import org.compiere.util.KeyNamePair; import org.compiere.Adempiere;
import org.compiere.util.Language; import org.compiere.util.DB;
import org.compiere.util.Login; import org.compiere.util.Env;
import org.zkoss.util.Locales; import org.compiere.util.KeyNamePair;
import org.zkoss.zhtml.Div; import org.compiere.util.Language;
import org.zkoss.zhtml.Table; import org.compiere.util.Login;
import org.zkoss.zhtml.Td; import org.compiere.util.Msg;
import org.zkoss.zhtml.Tr; import org.zkoss.util.Locales;
import org.zkoss.zk.au.out.AuFocus; import org.zkoss.zhtml.Div;
import org.zkoss.zk.au.out.AuScript; import org.zkoss.zhtml.Table;
import org.zkoss.zk.fn.ZkFns; import org.zkoss.zhtml.Td;
import org.zkoss.zk.ui.Component; import org.zkoss.zhtml.Tr;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.au.out.AuFocus;
import org.zkoss.zk.ui.Session; import org.zkoss.zk.au.out.AuScript;
import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.fn.ZkFns;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.Session;
import org.zkoss.zk.ui.util.Clients; import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zul.Comboitem; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Image; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
/** import org.zkoss.zk.ui.util.Clients;
* import org.zkoss.zul.Comboitem;
* @author <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a> import org.zkoss.zul.Image;
* @date Feb 25, 2007
* @version $Revision: 0.10 $ /**
* @author <a href="mailto:sendy.yagambrum@posterita.org">Sendy Yagambrum</a> *
* @date July 18, 2007 * @author <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
*/ * @date Feb 25, 2007
public class LoginPanel extends Window implements EventListener * @version $Revision: 0.10 $
{ * @author <a href="mailto:sendy.yagambrum@posterita.org">Sendy Yagambrum</a>
/** * @date July 18, 2007
* */
*/ public class LoginPanel extends Window implements EventListener
private static final long serialVersionUID = -2243984359460922023L; {
private static final String RESOURCE = "org.compiere.apps.ALoginRes"; /**
private ResourceBundle res = ResourceBundle.getBundle(RESOURCE); *
*/
private Properties ctx; private static final long serialVersionUID = -2243984359460922023L;
private Label lblUserId; private static final String RESOURCE = "org.compiere.apps.ALoginRes";
private Label lblPassword; private ResourceBundle res = ResourceBundle.getBundle(RESOURCE);
private Label lblLanguage;
private Textbox txtUserId; private Properties ctx;
private Textbox txtPassword; private Label lblUserId;
private Combobox lstLanguage; private Label lblPassword;
private LoginWindow wndLogin; private Label lblLanguage;
private Textbox txtUserId;
public LoginPanel(Properties ctx, LoginWindow loginWindow) private Textbox txtPassword;
{ private Combobox lstLanguage;
this.ctx = ctx; private LoginWindow wndLogin;
this.wndLogin = loginWindow;
initComponents(); public LoginPanel(Properties ctx, LoginWindow loginWindow)
init(); {
this.setId("loginPanel"); this.ctx = ctx;
this.wndLogin = loginWindow;
AuFocus auf = new AuFocus(txtUserId); initComponents();
Clients.response(auf); init();
} this.setId("loginPanel");
private void init() AuFocus auf = new AuFocus(txtUserId);
{ Clients.response(auf);
Div div = new Div(); }
div.setSclass(ITheme.LOGIN_BOX_HEADER_CLASS);
Label label = new Label("Login"); private void init()
label.setSclass(ITheme.LOGIN_BOX_HEADER_TXT_CLASS); {
div.appendChild(label); Div div = new Div();
this.appendChild(div); div.setSclass(ITheme.LOGIN_BOX_HEADER_CLASS);
Label label = new Label("Login");
Table table = new Table(); label.setSclass(ITheme.LOGIN_BOX_HEADER_TXT_CLASS);
table.setId("grdLogin"); div.appendChild(label);
table.setDynamicProperty("cellpadding", "0"); this.appendChild(div);
table.setDynamicProperty("cellspacing", "5");
table.setSclass(ITheme.LOGIN_BOX_BODY_CLASS); Table table = new Table();
table.setId("grdLogin");
this.appendChild(table); table.setDynamicProperty("cellpadding", "0");
table.setDynamicProperty("cellspacing", "5");
Tr tr = new Tr(); table.setSclass(ITheme.LOGIN_BOX_BODY_CLASS);
table.appendChild(tr);
Td td = new Td(); this.appendChild(table);
td.setSclass(ITheme.LOGIN_BOX_HEADER_LOGO_CLASS);
tr.appendChild(td); Tr tr = new Tr();
td.setDynamicProperty("colspan", "2"); table.appendChild(tr);
Image image = new Image(); Td td = new Td();
image.setSrc(ThemeManager.getLargeLogo()); td.setSclass(ITheme.LOGIN_BOX_HEADER_LOGO_CLASS);
td.appendChild(image); tr.appendChild(td);
td.setDynamicProperty("colspan", "2");
tr = new Tr(); Image image = new Image();
tr.setId("rowUser"); image.setSrc(ThemeManager.getLargeLogo());
table.appendChild(tr); td.appendChild(image);
td = new Td();
tr.appendChild(td); tr = new Tr();
td.setSclass(ITheme.LOGIN_LABEL_CLASS); tr.setId("rowUser");
td.appendChild(lblUserId); table.appendChild(tr);
td = new Td(); td = new Td();
td.setSclass(ITheme.LOGIN_FIELD_CLASS); tr.appendChild(td);
tr.appendChild(td); td.setSclass(ITheme.LOGIN_LABEL_CLASS);
td.appendChild(txtUserId); td.appendChild(lblUserId);
td = new Td();
tr = new Tr(); td.setSclass(ITheme.LOGIN_FIELD_CLASS);
tr.setId("rowPassword"); tr.appendChild(td);
table.appendChild(tr); td.appendChild(txtUserId);
td = new Td();
tr.appendChild(td); tr = new Tr();
td.setSclass(ITheme.LOGIN_LABEL_CLASS); tr.setId("rowPassword");
td.appendChild(lblPassword); table.appendChild(tr);
td = new Td(); td = new Td();
td.setSclass(ITheme.LOGIN_FIELD_CLASS); tr.appendChild(td);
tr.appendChild(td); td.setSclass(ITheme.LOGIN_LABEL_CLASS);
td.appendChild(txtPassword); td.appendChild(lblPassword);
td = new Td();
tr = new Tr(); td.setSclass(ITheme.LOGIN_FIELD_CLASS);
tr.setId("rowLanguage"); tr.appendChild(td);
table.appendChild(tr); td.appendChild(txtPassword);
td = new Td();
tr.appendChild(td); tr = new Tr();
td.setSclass(ITheme.LOGIN_LABEL_CLASS); tr.setId("rowLanguage");
td.appendChild(lblLanguage); table.appendChild(tr);
td = new Td(); td = new Td();
td.setSclass(ITheme.LOGIN_FIELD_CLASS); tr.appendChild(td);
tr.appendChild(td); td.setSclass(ITheme.LOGIN_LABEL_CLASS);
td.appendChild(lstLanguage); td.appendChild(lblLanguage);
td = new Td();
div = new Div(); td.setSclass(ITheme.LOGIN_FIELD_CLASS);
div.setSclass(ITheme.LOGIN_BOX_FOOTER_CLASS); tr.appendChild(td);
ConfirmPanel pnlButtons = new ConfirmPanel(false); td.appendChild(lstLanguage);
pnlButtons.addActionListener(this);
LayoutUtils.addSclass(ITheme.LOGIN_BOX_FOOTER_PANEL_CLASS, pnlButtons); div = new Div();
pnlButtons.setWidth(null); div.setSclass(ITheme.LOGIN_BOX_FOOTER_CLASS);
pnlButtons.getButton(ConfirmPanel.A_OK).setSclass(ITheme.LOGIN_BUTTON_CLASS); ConfirmPanel pnlButtons = new ConfirmPanel(false);
div.appendChild(pnlButtons); pnlButtons.addActionListener(this);
this.appendChild(div); LayoutUtils.addSclass(ITheme.LOGIN_BOX_FOOTER_PANEL_CLASS, pnlButtons);
} pnlButtons.setWidth(null);
pnlButtons.getButton(ConfirmPanel.A_OK).setSclass(ITheme.LOGIN_BUTTON_CLASS);
private void initComponents() div.appendChild(pnlButtons);
{ this.appendChild(div);
lblUserId = new Label(); }
lblUserId.setId("lblUserId");
lblUserId.setValue("User ID"); private void initComponents()
{
lblPassword = new Label(); lblUserId = new Label();
lblPassword.setId("lblPassword"); lblUserId.setId("lblUserId");
lblPassword.setValue("Password"); lblUserId.setValue("User ID");
lblLanguage = new Label(); lblPassword = new Label();
lblLanguage.setId("lblLanguage"); lblPassword.setId("lblPassword");
lblLanguage.setValue("Language"); lblPassword.setValue("Password");
txtUserId = new Textbox(); lblLanguage = new Label();
txtUserId.setId("txtUserId"); lblLanguage.setId("lblLanguage");
txtUserId.setCols(25); lblLanguage.setValue("Language");
txtUserId.setMaxlength(40);
txtUserId.setWidth("220px"); txtUserId = new Textbox();
txtUserId.addEventListener(Events.ON_CHANGE, this); // Elaine 2009/02/06 txtUserId.setId("txtUserId");
txtUserId.setCols(25);
txtPassword = new Textbox(); txtUserId.setMaxlength(40);
txtPassword.setId("txtPassword"); txtUserId.setWidth("220px");
txtPassword.setType("password"); txtUserId.addEventListener(Events.ON_CHANGE, this); // Elaine 2009/02/06
txtPassword.setCols(25);
txtPassword.setMaxlength(40); txtPassword = new Textbox();
txtPassword.setWidth("220px"); txtPassword.setId("txtPassword");
txtPassword.setType("password");
lstLanguage = new Combobox(); txtPassword.setCols(25);
lstLanguage.setAutocomplete(true); txtPassword.setMaxlength(40);
lstLanguage.setAutodrop(true); txtPassword.setWidth("220px");
lstLanguage.setId("lstLanguage");
lstLanguage.addEventListener(Events.ON_SELECT, this); lstLanguage = new Combobox();
lstLanguage.setWidth("220px"); lstLanguage.setAutocomplete(true);
lstLanguage.setAutodrop(true);
// Update Language List lstLanguage.setId("lstLanguage");
lstLanguage.getItems().clear(); lstLanguage.addEventListener(Events.ON_SELECT, this);
String[] availableLanguages = Language.getNames(); lstLanguage.setWidth("220px");
for (String langName : availableLanguages) {
Language language = Language.getLanguage(langName); // Update Language List
lstLanguage.appendItem(langName, language.getAD_Language()); lstLanguage.getItems().clear();
} String[] availableLanguages = Language.getNames();
for (String langName : availableLanguages) {
//set base language Language language = Language.getLanguage(langName);
String baseLanguage = Language.getBaseLanguage().getName(); lstLanguage.appendItem(langName, language.getAD_Language());
for(int i = 0; i < lstLanguage.getItemCount(); i++) }
{
Comboitem li = lstLanguage.getItemAtIndex(i); //set base language
if(li.getLabel().equals(baseLanguage)) String baseLanguage = Language.getBaseLanguage().getName();
{ for(int i = 0; i < lstLanguage.getItemCount(); i++)
lstLanguage.setSelectedIndex(i); {
languageChanged(li.getLabel()); Comboitem li = lstLanguage.getItemAtIndex(i);
break; if(li.getLabel().equals(baseLanguage))
} {
} lstLanguage.setSelectedIndex(i);
} languageChanged(li.getLabel());
break;
public void onEvent(Event event) }
{ }
Component eventComp = event.getTarget(); }
if (event.getTarget().getId().equals(ConfirmPanel.A_OK)) public void onEvent(Event event)
{ {
validateLogin(); Component eventComp = event.getTarget();
}
if (event.getName().equals(Events.ON_SELECT)) if (event.getTarget().getId().equals(ConfirmPanel.A_OK))
{ {
if(eventComp.getId().equals(lstLanguage.getId())) { validateLogin();
String langName = (String) lstLanguage.getSelectedItem().getLabel(); }
languageChanged(langName); if (event.getName().equals(Events.ON_SELECT))
} {
} if(eventComp.getId().equals(lstLanguage.getId())) {
// Elaine 2009/02/06 - initial language String langName = (String) lstLanguage.getSelectedItem().getLabel();
if (event.getName().equals(Events.ON_CHANGE)) languageChanged(langName);
{ }
if(eventComp.getId().equals(txtUserId.getId())) }
{ // Elaine 2009/02/06 - initial language
String userId = txtUserId.getValue(); if (event.getName().equals(Events.ON_CHANGE))
if(userId != null && userId.length() > 0) {
{ if(eventComp.getId().equals(txtUserId.getId()))
int AD_User_ID = DB.getSQLValue(null, "SELECT AD_User_ID FROM AD_User WHERE Name = ?", userId); {
if(AD_User_ID > 0) String userId = txtUserId.getValue();
{ if(userId != null && userId.length() > 0)
// Elaine 2009/02/06 Load preference from AD_Preference {
UserPreference userPreference = SessionManager.getSessionApplication().loadUserPreference(AD_User_ID); int AD_User_ID = DB.getSQLValue(null, "SELECT AD_User_ID FROM AD_User WHERE Name = ?", userId);
String initDefault = userPreference.getProperty(UserPreference.P_LANGUAGE); if(AD_User_ID > 0)
for(int i = 0; i < lstLanguage.getItemCount(); i++) {
{ // Elaine 2009/02/06 Load preference from AD_Preference
Comboitem li = lstLanguage.getItemAtIndex(i); UserPreference userPreference = SessionManager.getSessionApplication().loadUserPreference(AD_User_ID);
if(li.getLabel().equals(initDefault)) String initDefault = userPreference.getProperty(UserPreference.P_LANGUAGE);
{ for(int i = 0; i < lstLanguage.getItemCount(); i++)
lstLanguage.setSelectedIndex(i); {
languageChanged(li.getLabel()); // Elaine 2009/04/17 language changed Comboitem li = lstLanguage.getItemAtIndex(i);
break; if(li.getLabel().equals(initDefault))
} {
} lstLanguage.setSelectedIndex(i);
} languageChanged(li.getLabel()); // Elaine 2009/04/17 language changed
} break;
} }
} }
// }
} }
}
private void languageChanged(String langName) }
{ //
Language language = findLanguage(langName); }
res = ResourceBundle.getBundle(RESOURCE, language.getLocale()); private void languageChanged(String langName)
lblUserId.setValue(res.getString("User")); {
lblPassword.setValue(res.getString("Password")); Language language = findLanguage(langName);
lblLanguage.setValue(res.getString("Language"));
} res = ResourceBundle.getBundle(RESOURCE, language.getLocale());
lblUserId.setValue(res.getString("User"));
private Language findLanguage(String langName) { lblPassword.setValue(res.getString("Password"));
Language tmp = Language.getLanguage(langName); lblLanguage.setValue(res.getString("Language"));
Language language = new Language(tmp.getName(), tmp.getAD_Language(), tmp.getLocale(), tmp.isDecimalPoint(), }
tmp.getDateFormat().toPattern(), tmp.getMediaSize());
Env.verifyLanguage(ctx, language); private Language findLanguage(String langName) {
Env.setContext(ctx, Env.LANGUAGE, language.getAD_Language()); Language tmp = Language.getLanguage(langName);
Env.setContext(ctx, AEnv.LOCALE, language.getLocale().toString()); Language language = new Language(tmp.getName(), tmp.getAD_Language(), tmp.getLocale(), tmp.isDecimalPoint(),
return language; tmp.getDateFormat().toPattern(), tmp.getMediaSize());
} Env.verifyLanguage(ctx, language);
/** Env.setContext(ctx, Env.LANGUAGE, language.getAD_Language());
* validates user name and password when logging in Env.setContext(ctx, AEnv.LOCALE, language.getLocale().toString());
* return language;
**/ }
public void validateLogin() /**
{ * validates user name and password when logging in
Login login = new Login(ctx); *
String userId = txtUserId.getValue(); **/
String userPassword = txtPassword.getValue(); public void validateLogin()
KeyNamePair rolesKNPairs[] = login.getRoles(userId, userPassword); {
if(rolesKNPairs == null || rolesKNPairs.length == 0) Login login = new Login(ctx);
throw new WrongValueException("User Id or Password invalid!!!"); String userId = txtUserId.getValue();
String userPassword = txtPassword.getValue();
else KeyNamePair rolesKNPairs[] = login.getRoles(userId, userPassword);
{ if(rolesKNPairs == null || rolesKNPairs.length == 0)
String langName = null; throw new WrongValueException("User Id or Password invalid!!!");
if ( lstLanguage.getSelectedItem() != null )
langName = (String) lstLanguage.getSelectedItem().getLabel(); else
else {
langName = Language.getBaseLanguage().getName(); String langName = null;
Language language = findLanguage(langName); if ( lstLanguage.getSelectedItem() != null )
wndLogin.loginOk(userId, userPassword); langName = (String) lstLanguage.getSelectedItem().getLabel();
else
Env.setContext(ctx, UserPreference.LANGUAGE_NAME, language.getName()); // Elaine 2009/02/06 langName = Language.getBaseLanguage().getName();
Language language = findLanguage(langName);
Locales.setThreadLocal(language.getLocale()); wndLogin.loginOk(userId, userPassword);
Clients.response("zkLocaleJavaScript", new AuScript(null, ZkFns.outLocaleJavaScript())); Env.setContext(ctx, UserPreference.LANGUAGE_NAME, language.getName()); // Elaine 2009/02/06
}
Locales.setThreadLocal(language.getLocale());
// This temporary validation code is added to check the reported bug
// [ adempiere-ZK Web Client-2832968 ] User context lost? Clients.response("zkLocaleJavaScript", new AuScript(null, ZkFns.outLocaleJavaScript()));
// https://sourceforge.net/tracker/?func=detail&atid=955896&aid=2832968&group_id=176962 }
// it's harmless, if there is no bug then this must never fail
Session currSess = Executions.getCurrent().getDesktop().getSession(); /* Check DB version */
currSess.setAttribute("Check_AD_User_ID", Env.getAD_User_ID(ctx)); String version = DB.getSQLValueString(null, "SELECT Version FROM AD_System");
// End of temporary code for [ adempiere-ZK Web Client-2832968 ] User context lost? // Identical DB version
} if (! Adempiere.DB_VERSION.equals(version)) {
} String AD_Message = "DatabaseVersionError";
// Code assumes Database version {0}, but Database has Version {1}.
String msg = Msg.getMsg(ctx, AD_Message); // complete message
msg = MessageFormat.format(msg, new Object[] {Adempiere.DB_VERSION, version});
throw new ApplicationException(msg);
}
// This temporary validation code is added to check the reported bug
// [ adempiere-ZK Web Client-2832968 ] User context lost?
// https://sourceforge.net/tracker/?func=detail&atid=955896&aid=2832968&group_id=176962
// it's harmless, if there is no bug then this must never fail
Session currSess = Executions.getCurrent().getDesktop().getSession();
currSess.setAttribute("Check_AD_User_ID", Env.getAD_User_ID(ctx));
// End of temporary code for [ adempiere-ZK Web Client-2832968 ] User context lost?
}
}