details: https://code.openbravo.com/erp/devel/pi/rev/cd0eba2a0539
changeset: 31511:cd0eba2a0539
user: Carlos Aristu <carlos.aristu <at> openbravo.com>
date: Thu Feb 09 17:40:55 2017 +0100
summary: fixes issue 35106: The prompt text is not shown on the multiple
selector grids
The selector component was not configuring the showHover property. Now it is
configured in the selector fields by checking the UIDefinition of each one. The
UIDefinition has a new showHover method which defines if a reference supports
hover. It returns true by default but it can be overriden by any subclass in
case hover texts are not desired, like in the case of PasswordUIDefinition.
Together with this, the prompt for the checkbox fields of the multi-selector
grid has been enabled.
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/PasswordUIDefinition.java
| 6 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 9 +++++-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 6 +++-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-multi-selector-item.js
| 16 +++++++++-
4 files changed, 31 insertions(+), 6 deletions(-)
diffs (98 lines):
diff -r c6e7d84809eb -r cd0eba2a0539
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/PasswordUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/PasswordUIDefinition.java
Wed Feb 08 16:24:17 2017 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/PasswordUIDefinition.java
Thu Feb 09 17:40:55 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) 2011 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -51,8 +51,8 @@
// disable hover as it would show useless raw-value
@Override
- protected String getShowHoverGridFieldSettings(Field field) {
- return "";
+ public boolean showHover() {
+ return false;
}
}
diff -r c6e7d84809eb -r cd0eba2a0539
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Wed Feb 08 16:24:17 2017 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Thu Feb 09 17:40:55 2017 +0100
@@ -568,7 +568,14 @@
// but then the value should be converted to the translated
// value of the enum
protected String getShowHoverGridFieldSettings(Field field) {
- return ", showHover: true";
+ if (showHover()) {
+ return ", showHover: true";
+ }
+ return "";
+ }
+
+ public boolean showHover() {
+ return true;
}
protected String getGridFieldName(Field fld) {
diff -r c6e7d84809eb -r cd0eba2a0539
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Wed Feb 08 16:24:17 2017 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Thu Feb 09 17:40:55 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): ______________________________________.
************************************************************************
@@ -921,6 +921,10 @@
}
}
+
+ if (uiDefinition != null && uiDefinition.showHover()) {
+ result.add(createLocalSelectorFieldProperty("showHover", true));
+ }
return result;
}
diff -r c6e7d84809eb -r cd0eba2a0539
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-multi-selector-item.js
---
a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-multi-selector-item.js
Wed Feb 08 16:24:17 2017 +0100
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-multi-selector-item.js
Thu Feb 09 17:40:55 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) 2012-2014 Openbravo SLU
+ * All portions are Copyright (C) 2012-2017 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -137,6 +137,20 @@
};
this.selectorWindow.selectorGrid.recordDoubleClick = function (viewer,
record, recordnum, field, fieldnum) {};
+
+ // overridden to support hover on the header for the checkbox field
+ this.selectorWindow.selectorGrid.setFieldProperties = function (field,
properties) {
+ var localField = field;
+ if (isc.isA.Number(localField)) {
+ localField = this.fields[localField];
+ }
+ if (this.isCheckboxField(localField) && properties) {
+ properties.showHover = true;
+ properties.prompt =
OB.I18N.getLabel('OBUIAPP_GridSelectAllColumnPrompt');
+ }
+
+ return this.Super('setFieldProperties', arguments);
+ };
}
this.optionCriteria = {
------------------------------------------------------------------------------
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
