details: https://code.openbravo.com/erp/devel/pi/rev/8bc60787fdd0
changeset: 13613:8bc60787fdd0
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Mon Aug 29 11:06:45 2011 +0200
summary: Fixes issue 18297: Changed the logic to display button
- Show the button always unless the preference is set to N. This avoids the
need to add a new preference by default
diffstat:
src/org/openbravo/erpCommon/security/Login.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diffs (18 lines):
diff -r fa7bf5fee56b -r 8bc60787fdd0
src/org/openbravo/erpCommon/security/Login.java
--- a/src/org/openbravo/erpCommon/security/Login.java Mon Aug 29 10:49:56
2011 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.java Mon Aug 29 11:06:45
2011 +0200
@@ -255,11 +255,12 @@
obc.setFilterOnReadableOrganization(false);
obc.add(Restrictions.eq(Preference.PROPERTY_PROPERTY,
GOOGLE_PREFERENCE_PROPERTY));
- obc.add(Restrictions.eq(Preference.PROPERTY_SEARCHKEY, "Y"));
+ obc.add(Restrictions.eq(Preference.PROPERTY_SEARCHKEY, "N"));
obc.add(Restrictions.or(Restrictions.eq(Preference.PROPERTY_VISIBLEATCLIENT,
systemClient),
Restrictions.isNull(Preference.PROPERTY_VISIBLEATCLIENT)));
- showGoogleIcon = obc.count() > 0;
+ // show by default - not show when there is a preference to disable it
+ showGoogleIcon = obc.count() == 0;
} else {
showGoogleIcon = (module != null && module.isEnabled());
}
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
