details: https://code.openbravo.com/erp/devel/pi/rev/981d6d67a027
changeset: 14775:981d6d67a027
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Nov 30 18:57:07 2011 +0100
summary: Issue 18763: Added window title based on parameter name
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
| 1 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 22 +++++++--
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
| 1 +
4 files changed, 20 insertions(+), 6 deletions(-)
diffs (98 lines):
diff -r d6d90a1973bf -r 981d6d67a027
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Wed Nov 30 18:16:57 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Wed Nov 30 18:57:07 2011 +0100
@@ -69,6 +69,7 @@
processId: '${field.processId?js_string}',
<#if field.newDefinition>newDefinition:
${field.newDefinition?string},</#if>
<#if field.windowId != "">windowId: '${field.windowId?js_string}',</#if>
+ <#if field.windowTitle != "">windowTitle:
'${field.windowTitle?js_string}',</#if>
<#if !field.modal>modal: ${field.modal?string},</#if>
<#if field.hasLabelValues>
labelValue: {<#list field.labelValues as value>
diff -r d6d90a1973bf -r 981d6d67a027
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Wed Nov 30 18:16:57 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Wed Nov 30 18:57:07 2011 +0100
@@ -409,16 +409,16 @@
}
public boolean isAllowAdd() {
- if (tab.isObuiappCanAdd() != null) {
- return tab.isObuiappCanAdd();
- }
+ // if (tab.isObuiappCanAdd() != null) {
+ // return tab.isObuiappCanAdd();
+ // }
return false;
}
public boolean isAllowDelete() {
- if (tab.isObuiappCanDelete() != null) {
- return tab.isObuiappCanDelete();
- }
+ // if (tab.isObuiappCanDelete() != null) {
+ // return tab.isObuiappCanDelete();
+ // }
return false;
}
@@ -436,6 +436,7 @@
private boolean modal = true;
private String processId = "";
private String windowId = "";
+ private String windowTitle = "";
private boolean newDefinition = false;
public ButtonField(Field fld) {
@@ -540,6 +541,7 @@
} else {
setWindowId(p.getReferenceSearchKey().getOBUIAPPRefWindowList().get(0).getWindow()
.getId());
+ setWindowTitle(p.getName());
}
return;
} else if
(p.getReference().getId().equals(ApplicationConstants.BUTTON_LIST_REFERENCE_ID))
{
@@ -638,6 +640,14 @@
this.windowId = windowId;
}
+ public String getWindowTitle() {
+ return windowTitle;
+ }
+
+ public void setWindowTitle(String windowTitle) {
+ this.windowTitle = windowTitle;
+ }
+
public class Value {
private String value;
private String labelValue;
diff -r d6d90a1973bf -r 981d6d67a027
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js
Wed Nov 30 18:16:57 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js
Wed Nov 30 18:57:07 2011 +0100
@@ -31,6 +31,7 @@
showMinimizeButton: false,
showMaximizeButton: false,
showFooter: false,
+ showTitle: true,
width: '100%',
height: '100%',
@@ -74,6 +75,7 @@
this.dataSource = this.viewProperties.dataSource;
this.dataSource.view = this;
+ this.title = this.windowTitle;
// the datasource object is defined on viewProperties, do not destroy it
this.dataSource.potentiallyShared = true;
diff -r d6d90a1973bf -r 981d6d67a027
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
Wed Nov 30 18:16:57 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
Wed Nov 30 18:57:07 2011 +0100
@@ -84,6 +84,7 @@
standardWindow.openProcess({
processId: me.processId,
windowId: me.windowId,
+ windowTitle: me.windowTitle,
actionHandler: me.command,
buttons: me.labelValue
});
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
