details: https://code.openbravo.com/erp/devel/pi/rev/1311ace8dcad changeset: 13466:1311ace8dcad user: Martin Taal <martin.taal <at> openbravo.com> date: Mon Aug 08 22:34:52 2011 +0200 summary: Made the url link item a bit more robust if the url does not start with http://
details: https://code.openbravo.com/erp/devel/pi/rev/1df00298a39e changeset: 13467:1df00298a39e user: Martin Taal <martin.taal <at> openbravo.com> date: Mon Aug 08 22:36:07 2011 +0200 summary: Fixes issue 18206: [Personalize form layout] Image type item has not the upload icon Let the icons of the image formitem also show when the form item is disabled Add a property isPreviewFormItem to true for the fields shown in the preview form diffstat: modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-personalization-form.js.ftl | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js | 15 +++++++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js | 5 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diffs (67 lines): diff -r 5acd44629c18 -r 1df00298a39e modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-personalization-form.js.ftl --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-personalization-form.js.ftl Mon Aug 08 22:00:24 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-personalization-form.js.ftl Mon Aug 08 22:36:07 2011 +0200 @@ -30,6 +30,7 @@ startRow: ${fieldDefinition.startRow?string}, endRow: ${fieldDefinition.endRow?string}, personalizable: ${fieldDefinition.personalizable?string}, + isPreviewFormItem: true, disabled: true, showDisabled: false, <#if !fieldDefinition.displayed> diff -r 5acd44629c18 -r 1df00298a39e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js Mon Aug 08 22:00:24 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js Mon Aug 08 22:36:07 2011 +0200 @@ -100,7 +100,7 @@ //which are used to upload and delete images. isc.ClassFactory.defineClass('OBImageCanvas', isc.HLayout); -OBImageCanvas.addProperties({ +isc.OBImageCanvas.addProperties({ initWidget: function(){ this.imageLayout = isc.OBImageItemSmallImageContainer.create({ imageItem: this.creator @@ -174,6 +174,14 @@ } } }); + + if (this.parentItem.isPreviewFormItem) { + selectorButton.showDisabled = false; + selectorButton.showDisabledIcon = false; + deleteButton.showDisabled = false; + deleteButton.showDisabledIcon = false; + } + this.deleteButton = deleteButton; buttonLayout.addMember(selectorButton); buttonLayout.addMember(deleteButton); @@ -201,6 +209,11 @@ isc.OBImageItem.addProperties({ shouldSaveValue: true, canvasConstructor: 'OBImageCanvas', + init: function() { + this.canvasProperties = this.canvasProperties || {}; + this.canvasProperties.parentItem = this; + this.Super('init', arguments); + }, setValue: function(newValue){ if(!newValue || newValue === '') { this.canvas.setImage(''); diff -r 5acd44629c18 -r 1df00298a39e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js Mon Aug 08 22:00:24 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js Mon Aug 08 22:36:07 2011 +0200 @@ -31,9 +31,12 @@ hspace: this.pickerIconHspace, click: function(form, item) { var url = item.getValue(); - if(!url || url.indexOf('://') === -1) { + if (!url) { return; } + if (!url.toLowerCase().startsWith('http://')) { + url = 'http://' + url; + } window.open(url); } }]; ------------------------------------------------------------------------------ BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA The must-attend event for mobile developers. Connect with experts. Get tools for creating Super Apps. See the latest technologies. Sessions, hands-on labs, demos & much more. Register early & save! http://p.sf.net/sfu/rim-blackberry-1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
