details: /erp/devel/pi/rev/7b048b094766
changeset: 12043:7b048b094766
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri May 06 13:28:19 2011 +0200
summary: [attachments] Improve delete confirmation title and message
details: /erp/devel/pi/rev/522f3fa70938
changeset: 12044:522f3fa70938
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri May 06 16:09:34 2011 +0200
summary: [attachments] Improved alignment of Attachments section in form view
details: /erp/devel/pi/rev/3e7a32d41754
changeset: 12045:3e7a32d41754
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri May 06 16:38:46 2011 +0200
summary: [attachments] Avoid the appearance of a vertical scrollbar in the
attachments section
details: /erp/devel/pi/rev/85fa3a1a417e
changeset: 12046:85fa3a1a417e
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri May 06 17:22:20 2011 +0200
summary: [attachments] Avoid wrapping of file names in attachments section
details: /erp/devel/pi/rev/69c4727f156f
changeset: 12047:69c4727f156f
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri May 06 17:30:32 2011 +0200
summary: Avoid a NullPointerException in the FIC if there is no changedColumn
on CHANGE mode
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 15 +++++-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-attachments.js
| 26 ++++++---
3 files changed, 31 insertions(+), 12 deletions(-)
diffs (163 lines):
diff -r b752993f285e -r 69c4727f156f
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 May 06 17:04:06 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri May 06 17:30:32 2011 +0200
@@ -1075,7 +1075,7 @@
<!--FF8080812FB0FC61012FBA3EBC6F01DC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--FF8080812FB0FC61012FBA3EBC6F01DC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--FF8080812FB0FC61012FBA3EBC6F01DC-->
<VALUE><![CDATA[OBUIAPP_ConfirmRemove]]></VALUE>
-<!--FF8080812FB0FC61012FBA3EBC6F01DC--> <MSGTEXT><![CDATA[The file will be
permanently deleted. Are you sure you want to proceed?]]></MSGTEXT>
+<!--FF8080812FB0FC61012FBA3EBC6F01DC--> <MSGTEXT><![CDATA[Are you sure you
want to permanently delete this attachment?]]></MSGTEXT>
<!--FF8080812FB0FC61012FBA3EBC6F01DC--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--FF8080812FB0FC61012FBA3EBC6F01DC-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8080812FB0FC61012FBA3EBC6F01DC--></AD_MESSAGE>
@@ -1086,11 +1086,22 @@
<!--FF8080812FB0FC61012FBA3FF29701E9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--FF8080812FB0FC61012FBA3FF29701E9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--FF8080812FB0FC61012FBA3FF29701E9-->
<VALUE><![CDATA[OBUIAPP_ConfirmRemoveAll]]></VALUE>
-<!--FF8080812FB0FC61012FBA3FF29701E9--> <MSGTEXT><![CDATA[All the files
related to this record will be permanently deleted. Are you sure you want to
proceed?]]></MSGTEXT>
+<!--FF8080812FB0FC61012FBA3FF29701E9--> <MSGTEXT><![CDATA[Are you sure you
want to permanently delete all the attachments of this record?]]></MSGTEXT>
<!--FF8080812FB0FC61012FBA3FF29701E9--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--FF8080812FB0FC61012FBA3FF29701E9-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8080812FB0FC61012FBA3FF29701E9--></AD_MESSAGE>
+<!--FF8080812FC4FC29012FC50394FC000A--><AD_MESSAGE>
+<!--FF8080812FC4FC29012FC50394FC000A-->
<AD_MESSAGE_ID><![CDATA[FF8080812FC4FC29012FC50394FC000A]]></AD_MESSAGE_ID>
+<!--FF8080812FC4FC29012FC50394FC000A-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812FC4FC29012FC50394FC000A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812FC4FC29012FC50394FC000A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812FC4FC29012FC50394FC000A-->
<VALUE><![CDATA[OBUIAPP_ConfirmRemoveTitle]]></VALUE>
+<!--FF8080812FC4FC29012FC50394FC000A--> <MSGTEXT><![CDATA[Confirm
Deletion]]></MSGTEXT>
+<!--FF8080812FC4FC29012FC50394FC000A--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812FC4FC29012FC50394FC000A-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812FC4FC29012FC50394FC000A--></AD_MESSAGE>
+
<!--FF8081812D6761CF012D676DF2A70045--><AD_MESSAGE>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_MESSAGE_ID><![CDATA[FF8081812D6761CF012D676DF2A70045]]></AD_MESSAGE_ID>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r b752993f285e -r 69c4727f156f
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri May 06 17:04:06 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri May 06 17:30:32 2011 +0200
@@ -699,7 +699,7 @@
log.debug("Columns in validation: '" + cols + "'");
}
- if (mode.equals("CHANGE")) {
+ if (mode.equals("CHANGE") && changedColumn != null) {
// In case of a CHANGE event, we only add the changed column, to avoid
firing reloads for
// every column in the tab, instead firing reloads just for the
dependant columns
String changedCol = "";
diff -r b752993f285e -r 69c4727f156f
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-attachments.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-attachments.js
Fri May 06 17:04:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-attachments.js
Fri May 06 17:30:32 2011 +0200
@@ -32,7 +32,6 @@
// width: '100%',
// height: '100%',
- overflow: 'hidden',
canFocus: true,
@@ -130,7 +129,8 @@
layoutMargin: 5,
- width: '50%',
+ width: '100%',
+ align: 'left',
/**
* Initializes the widget
@@ -181,10 +181,11 @@
},
fileExists: function(fileName, attachments){
+ var i;
if(!attachments || attachments.length === 0){
return false;
}
- for(var i=0; i < attachments.length; i++){
+ for(i=0; i < attachments.length; i++){
if(attachments[i].name === fileName){
return true;
}
@@ -200,7 +201,7 @@
var me = this;
var addButton = isc.OBSectionItemControlLink.create({
contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentAdd')+' ]',
- width: '100%',
+ width: '30px',
canvas: me,
action: function(){
var attachmentFile = OB.I18N.getLabel('OBUIAPP_AttachmentFile');
@@ -284,6 +285,7 @@
isc_OBAttachmentsSectionItem_0.setValue(OB.I18N.getLabel('OBUIAPP_AttachmentTitle')+"
("+attachments.length+")");
var downloadAllButton = isc.OBSectionItemControlLink.create({
contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentDownloadAll')+' ]',
+ width: '30px',
canvas: this,
action: function(){
var canvas = this.canvas;
@@ -301,6 +303,7 @@
});
var removeAllButton = isc.OBSectionItemControlLink.create({
contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentRemoveAll')+' ]',
+ width: '30px',
canvas: me,
action: function(){
var d = {
@@ -316,7 +319,7 @@
canvas.fillAttachments(data.attachments);
});
}
- });
+ },{title: OB.I18N.getLabel('OBUIAPP_ConfirmRemoveTitle')});
}
});
hLayout.addMember(downloadAllButton);
@@ -331,6 +334,7 @@
};
var removeActions = function(){
+ var i;
var d = {
Command: 'DELETE',
tabId: this.canvas.tabId,
@@ -345,30 +349,34 @@
canvas.fillAttachments(data.attachments);
});
}
- });
+ },{title: OB.I18N.getLabel('OBUIAPP_ConfirmRemoveTitle')});
};
- for(var i=0; i < attachments.length; i++){
+ for(i=0; i < attachments.length; i++){
var attachment = attachments[i];
var buttonLayout = isc.HLayout.create();
var attachmentLabel = isc.Label.create({
contents: attachment.name,
- width: '35%'
+ width: '200px',
+ wrap: false
});
var attachmentBy = isc.Label.create({
contents: " <i>"+OB.I18N.getLabel('OBUIAPP_AttachmentBy')+"
"+attachment.createdby+"</i>"
});
+ var creationDate = OB.Utilities.getTimePassed(new
Date(attachment.creationDate));
var attachmentCreationDate = isc.Label.create({
- contents: OB.Utilities.getTimePassed(new Date(attachment.creationDate))
+ contents: creationDate
});
var downloadAttachment = isc.OBSectionItemControlLink.create({
contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentDownload')+' ]',
+ width: '30px',
attachmentName: attachment.name,
attachId: attachment.id,
action: downloadActions
});
var removeAttachment = isc.OBSectionItemControlLink.create({
contents: '[ '+OB.I18N.getLabel('OBUIAPP_AttachmentRemove')+' ]',
+ width: '30px',
attachmentName: attachment.name,
attachmentId: attachment.id,
canvas: this,
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
