details: https://code.openbravo.com/erp/devel/pi/rev/dc2040031910
changeset: 14190:dc2040031910
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Nov 04 13:34:40 2011 +0100
summary: Fixes issue 18667: Provide a reset-to-defaults for Personalized Forms
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 11 ++++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
| 6 ++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
| 18 ++++++---
3 files changed, 27 insertions(+), 8 deletions(-)
diffs (86 lines):
diff -r d82869324dad -r dc2040031910
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Nov 04 07:33:29 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Nov 04 13:34:40 2011 +0100
@@ -519,6 +519,17 @@
<!--ABFDBB83F58841EA9545D9ED8637513B-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--ABFDBB83F58841EA9545D9ED8637513B--></AD_MESSAGE>
+<!--AD6549B710194782BAB683B1DB839E49--><AD_MESSAGE>
+<!--AD6549B710194782BAB683B1DB839E49-->
<AD_MESSAGE_ID><![CDATA[AD6549B710194782BAB683B1DB839E49]]></AD_MESSAGE_ID>
+<!--AD6549B710194782BAB683B1DB839E49-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AD6549B710194782BAB683B1DB839E49--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AD6549B710194782BAB683B1DB839E49--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AD6549B710194782BAB683B1DB839E49-->
<VALUE><![CDATA[OBUIAPP_StandardView]]></VALUE>
+<!--AD6549B710194782BAB683B1DB839E49--> <MSGTEXT><![CDATA[Standard
View]]></MSGTEXT>
+<!--AD6549B710194782BAB683B1DB839E49--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--AD6549B710194782BAB683B1DB839E49-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--AD6549B710194782BAB683B1DB839E49--></AD_MESSAGE>
+
<!--B05C4EF1C8624EAAAC53764B7DACB2C2--><AD_MESSAGE>
<!--B05C4EF1C8624EAAAC53764B7DACB2C2-->
<AD_MESSAGE_ID><![CDATA[B05C4EF1C8624EAAAC53764B7DACB2C2]]></AD_MESSAGE_ID>
<!--B05C4EF1C8624EAAAC53764B7DACB2C2-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r d82869324dad -r dc2040031910
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
Fri Nov 04 07:33:29 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
Fri Nov 04 13:34:40 2011 +0100
@@ -133,7 +133,11 @@
// cache the original view so that it can be restored
if (!this.getClass().originalView) {
- this.getClass().originalView =
OB.Personalization.getViewDefinition(this, '', false);
+ this.getClass().originalView = {};
+ this.getClass().originalView.personalizationId = 'dummyId';
+ this.getClass().originalView.viewDefinition =
OB.Personalization.getViewDefinition(this, '', false);
+ this.getClass().originalView.viewDefinition.name =
OB.I18N.getLabel('OBUIAPP_StandardView');
+ this.getClass().originalView.canDelete = false;
}
this.getClass().personalization = personalization;
diff -r d82869324dad -r dc2040031910
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
Fri Nov 04 07:33:29 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
Fri Nov 04 13:34:40 2011 +0100
@@ -61,7 +61,7 @@
action: function() {
var data = [], icon, i, undef, view, formData,
standardWindow = this.view.standardWindow,
- adminLevel = false, length,
+ adminLevel = false, length, viewSelected = false,
personalization = standardWindow.getClass().personalization,
views = personalization && personalization.views ?
personalization.views : [],
canDelete = false;
@@ -71,6 +71,15 @@
return;
}
+ // add the standard view, but make a copy so that it is not added
+ // to the real list of editable/deletable views
+ views = isc.shallowClone(views);
+ views.push(standardWindow.getClass().originalView);
+
+ if (!standardWindow.selectedPersonalizationId) {
+ standardWindow.selectedPersonalizationId =
standardWindow.getClass().originalView.personalizationId;
+ }
+
// create the list of current views to show
length = views.length;
for (i = 0; i < length; i++) {
@@ -78,7 +87,7 @@
canDelete = view.canEdit || canDelete;
if (standardWindow.selectedPersonalizationId && view.personalizationId
=== standardWindow.selectedPersonalizationId) {
- icon = this.menu.itemIcon;
+ icon = this.menu.itemIcon;
} else {
icon = null;
}
@@ -140,11 +149,6 @@
popup.show();
}});
}
-
- data.push({title: OB.I18N.getLabel('OBUIAPP_RestoreDefaults'),
- doClick: function(standardWindow) {
- OB.Personalization.applyViewDefinition('',
standardWindow.getClass().originalView, standardWindow);
- }});
}
if (data.length === 0) {
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
