details: https://code.openbravo.com/erp/devel/pi/rev/3b8cc6900226
changeset: 31696:3b8cc6900226
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Mar 16 10:24:21 2017 +0100
summary: fixed bug 35537: 0 concurrent users is seen in About popup for
unlimited users
In this case now Unlimited is displayed instead
diffstat:
src/org/openbravo/erpCommon/obps/ActivationKey.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diffs (25 lines):
diff -r 2e6e168839f9 -r 3b8cc6900226
src/org/openbravo/erpCommon/obps/ActivationKey.java
--- a/src/org/openbravo/erpCommon/obps/ActivationKey.java Wed Mar 15
19:16:54 2017 +0000
+++ b/src/org/openbravo/erpCommon/obps/ActivationKey.java Thu Mar 16
10:24:21 2017 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009-2016 Openbravo SLU
+ * All portions are Copyright (C) 2009-2017 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -1256,8 +1256,10 @@
public String getLicenseExplanation(ConnectionProvider conn, String lang) {
if (licenseType == LicenseType.CONCURRENT_USERS) {
- return getProperty("limitusers") + " " + Utility.messageBD(conn,
"OPSConcurrentUsers", lang);
-
+ String userLimit = getProperty("limitusers");
+ String userMsg = "0".equals(userLimit) ? Utility.messageBD(conn,
"OPSUnlimitedUsers", lang)
+ : userLimit;
+ return userMsg + " " + Utility.messageBD(conn, "OPSConcurrentUsers",
lang);
} else {
return Utility.getListValueName("OPSLicenseType",
getProperty("lincensetype"), lang);
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
