details: https://code.openbravo.com/erp/devel/pi/rev/d2e5daf7691b changeset: 13366:d2e5daf7691b user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Jul 29 12:26:54 2011 +0200 summary: [imageBLOB] Improved styling of the Image selector popup
details: https://code.openbravo.com/erp/devel/pi/rev/0951c9cfecef changeset: 13367:0951c9cfecef user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Mon Aug 01 17:04:08 2011 +0200 summary: Fixed issue 18116. Names of common columns will now be generated correctly diffstat: modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js | 3 - modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 14 ++++- src-db/database/model/functions/AD_TABLE_IMPORT.xml | 29 ++++++++- 4 files changed, 40 insertions(+), 8 deletions(-) diffs (115 lines): diff -r 19135e59b532 -r 0951c9cfecef 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 Mon Aug 01 16:57:41 2011 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Mon Aug 01 17:04:08 2011 +0200 @@ -1406,7 +1406,7 @@ <!--FF80808131509CDA013150B7DBF30021--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF80808131509CDA013150B7DBF30021--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF80808131509CDA013150B7DBF30021--> <VALUE><![CDATA[OBUIAPP_ImageFile]]></VALUE> -<!--FF80808131509CDA013150B7DBF30021--> <MSGTEXT><![CDATA[Image File]]></MSGTEXT> +<!--FF80808131509CDA013150B7DBF30021--> <MSGTEXT><![CDATA[File]]></MSGTEXT> <!--FF80808131509CDA013150B7DBF30021--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF80808131509CDA013150B7DBF30021--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--FF80808131509CDA013150B7DBF30021--></AD_MESSAGE> diff -r 19135e59b532 -r 0951c9cfecef 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 01 16:57:41 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js Mon Aug 01 17:04:08 2011 +0200 @@ -266,9 +266,6 @@ addForm: null, showMinimizeButton : false, showMaximizeButton : false, - height: '40px', - width: '200px', - align: 'center', title: OB.I18N.getLabel('OBUIAPP_ImageSelectorTitle'), initWidget: function(args){ var imageId = this.imageItem.getValue(); diff -r 19135e59b532 -r 0951c9cfecef modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js --- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js Mon Aug 01 16:57:41 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js Mon Aug 01 17:04:08 2011 +0200 @@ -23,6 +23,7 @@ * 2) OBImageItem * 3) SectionItem Button Styles * 3) Attachments Styles + * 4) Image Popup Styles =======================================================================*/ /* ===================================================================== @@ -502,4 +503,15 @@ height: 30, width: 450, align: 'center' -}); \ No newline at end of file +}); + + /* ===================================================================== + * Image Popup Styles + =======================================================================*/ + + isc.OBImageSelector.addProperties({ + hlayoutTopMargin: 10, + height: 30, + width: 450, + align: 'center' + }); \ No newline at end of file diff -r 19135e59b532 -r 0951c9cfecef src-db/database/model/functions/AD_TABLE_IMPORT.xml --- a/src-db/database/model/functions/AD_TABLE_IMPORT.xml Mon Aug 01 16:57:41 2011 +0200 +++ b/src-db/database/model/functions/AD_TABLE_IMPORT.xml Mon Aug 01 17:04:08 2011 +0200 @@ -62,6 +62,7 @@ v_IsUpdateable CHAR(1):='Y'; v_DefaultValue NVARCHAR2(2000):=''; v_SeqNo NUMBER(10) ; + v_columnNameOrg VARCHAR2(40) ; v_columnName VARCHAR2(40) ; v_TableName VARCHAR2(40) ; v_LastColumnName VARCHAR2(40) ; @@ -229,7 +230,29 @@ IF(v_columnName LIKE '%_Id') THEN v_columnName:=SUBSTR(v_columnName, 1, LENGTH(v_columnName) -3) ||'_ID'; END IF; - + -- Some columns need to have specific names for DAL to work correctly: + v_columnNameOrg:=v_columnName; + IF(v_columnName = 'AD_Org_ID') THEN + v_columnName:='Organization'; + END IF; + IF(v_columnName = 'AD_Client_ID') THEN + v_columnName:='Client'; + END IF; + IF(v_columnName = 'Created') THEN + v_columnName:='Creation Date'; + END IF; + IF(v_columnName = 'Createdby') THEN + v_columnName:='Created By'; + END IF; + IF(v_columnName = 'Updated') THEN + v_columnName:='Updated'; + END IF; + IF(v_columnName = 'Updatedby') THEN + v_columnName:='Updated By'; + END IF; + IF(v_columnName = 'Isactive') THEN + v_columnName:='Active'; + END IF; IF substr(upper(v_columnName),1,3)='EM_' then db_prefix := substr(v_columnName,4,instr(v_columnName,'_',1,2)-4); DBMS_OUTPUT.PUT_LINE('Prefix:'||db_prefix); @@ -284,7 +307,7 @@ VALUES (v_NextNo, '0', '0', 'Y', now(), '0', now(), '0', - v_columnName, v_columnName, Cur_Column.AD_Table_ID, + v_columnName,v_columnNameOrg, Cur_Column.AD_Table_ID, v_AD_Reference_ID, v_FieldLength, v_IsKey, v_IsParent, (CASE Cur_Column.Nullable WHEN 'Y' THEN 'N' ELSE 'Y' END), v_IsIdentifier, v_SeqNo, 'N', 'N', v_IsUpdateable, v_AD_Reference_Value_ID, @@ -313,7 +336,7 @@ FOR Cur_CommonCols IN (select columnname from ad_column c where c.ad_table_id = '100' - and lower(c.columnname) in ('ad_client_id','ad_org_id','isactive','created','updated','createdby','updatedby') + and lower(c.columnname) in ('client','organization','active','creation date','updated','created by','updated by') and not exists (select 1 from ad_column c1 where c1.ad_table_id = v_Record_ID ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
