From aeecc7cc2363fc73309999267f165800ae8834ab Mon Sep 17 00:00:00 2001 From: Diego Ruiz Date: Thu, 22 Oct 2015 15:55:54 +0200 Subject: [PATCH] IDEMPIERE-2896 UX: Doubleclick in text fields --- .../oracle/201510221522_IDEMPIERE-2896.sql | 43 +++++++++++++++++++ .../201510221522_IDEMPIERE-2896.sql | 40 +++++++++++++++++ .../adempiere/webui/adwindow/ADTabpanel.java | 3 +- 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 migration/i2.1z/oracle/201510221522_IDEMPIERE-2896.sql create mode 100644 migration/i2.1z/postgresql/201510221522_IDEMPIERE-2896.sql diff --git a/migration/i2.1z/oracle/201510221522_IDEMPIERE-2896.sql b/migration/i2.1z/oracle/201510221522_IDEMPIERE-2896.sql new file mode 100644 index 0000000000..3732467d57 --- /dev/null +++ b/migration/i2.1z/oracle/201510221522_IDEMPIERE-2896.sql @@ -0,0 +1,43 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-2896 UX: Doubleclick in text fields +-- Oct 22, 2015 3:21:25 PM CEST +INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (202920,0,0,'Y',TO_DATE('2015-10-22 15:21:25','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2015-10-22 15:21:25','YYYY-MM-DD HH24:MI:SS'),0,'ToggleOnDoubleClick','Toggle on Double Click','Defines if double click in a field on grid mode switch to form view','Defines if double click in a field on grid mode switch to form view','Toggle on Double Click','D','f4bda10b-d0d4-4763-9c2a-6d57c38d8c43') +; + +-- Oct 22, 2015 3:21:43 PM CEST +INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,DefaultValue,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType) VALUES (212330,0,'Toggle on Double Click','Defines if double click in a field on grid mode switch to form view','Defines if double click in a field on grid mode switch to form view',200174,'ToggleOnDoubleClick','N',1,'N','N','N','N','N',0,'N',20,0,0,'Y',TO_DATE('2015-10-22 15:21:43','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2015-10-22 15:21:43','YYYY-MM-DD HH24:MI:SS'),0,202920,'Y','N','D','N','N','N','Y','82ce8855-972f-4673-bfe4-b2f74219a50b','Y',0,'N','N','N') +; + +-- Oct 22, 2015 3:21:49 PM CEST +INSERT INTO AD_TreeNode (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNode_UU) SELECT t.AD_Client_ID, 0, 'Y', SysDate, 0, SysDate, 0,t.AD_Tree_ID, 200000, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='TL' AND t.AD_Table_ID=282 AND NOT EXISTS (SELECT * FROM AD_TreeNode e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200000) +; + +-- Oct 22, 2015 3:21:49 PM CEST +ALTER TABLE AD_UserPreference ADD ToggleOnDoubleClick CHAR(1) DEFAULT 'N' CHECK (ToggleOnDoubleClick IN ('Y','N')) +; + +-- Oct 22, 2015 3:22:22 PM CEST +INSERT INTO AD_TreeNode (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNode_UU) SELECT t.AD_Client_ID, 0, 'Y', SysDate, 0, SysDate, 0,t.AD_Tree_ID, 200001, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='TL' AND t.AD_Table_ID=282 AND NOT EXISTS (SELECT * FROM AD_TreeNode e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200001) +; + +-- Oct 22, 2015 3:22:22 PM CEST +INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan) VALUES (203913,'Toggle on Double Click','Defines if double click in a field on grid mode switch to form view','Defines if double click in a field on grid mode switch to form view',200189,212330,'Y',1,80,'N','N','N','N',0,0,'Y',TO_DATE('2015-10-22 15:22:22','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2015-10-22 15:22:22','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','606eb6b0-a10e-4807-af1b-a2f7c8519115','Y',80,2,2) +; + +-- Oct 22, 2015 3:22:42 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=60, XPosition=2,Updated=TO_DATE('2015-10-22 15:22:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203913 +; + +-- Oct 22, 2015 3:22:42 PM CEST +UPDATE AD_Field SET SeqNo=70,Updated=TO_DATE('2015-10-22 15:22:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203800 +; + +-- Oct 22, 2015 3:22:42 PM CEST +UPDATE AD_Field SET SeqNo=80,Updated=TO_DATE('2015-10-22 15:22:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203798 +; + +SELECT register_migration_script('201510221522_IDEMPIERE-2896.sql') FROM dual +; + diff --git a/migration/i2.1z/postgresql/201510221522_IDEMPIERE-2896.sql b/migration/i2.1z/postgresql/201510221522_IDEMPIERE-2896.sql new file mode 100644 index 0000000000..62afe810fd --- /dev/null +++ b/migration/i2.1z/postgresql/201510221522_IDEMPIERE-2896.sql @@ -0,0 +1,40 @@ +-- IDEMPIERE-2896 UX: Doubleclick in text fields +-- Oct 22, 2015 3:21:25 PM CEST +INSERT INTO AD_Element (AD_Element_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,ColumnName,Name,Description,Help,PrintName,EntityType,AD_Element_UU) VALUES (202920,0,0,'Y',TO_TIMESTAMP('2015-10-22 15:21:25','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2015-10-22 15:21:25','YYYY-MM-DD HH24:MI:SS'),0,'ToggleOnDoubleClick','Toggle on Double Click','Defines if double click in a field on grid mode switch to form view','Defines if double click in a field on grid mode switch to form view','Toggle on Double Click','D','f4bda10b-d0d4-4763-9c2a-6d57c38d8c43') +; + +-- Oct 22, 2015 3:21:43 PM CEST +INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,DefaultValue,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType) VALUES (212330,0,'Toggle on Double Click','Defines if double click in a field on grid mode switch to form view','Defines if double click in a field on grid mode switch to form view',200174,'ToggleOnDoubleClick','N',1,'N','N','N','N','N',0,'N',20,0,0,'Y',TO_TIMESTAMP('2015-10-22 15:21:43','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2015-10-22 15:21:43','YYYY-MM-DD HH24:MI:SS'),0,202920,'Y','N','D','N','N','N','Y','82ce8855-972f-4673-bfe4-b2f74219a50b','Y',0,'N','N','N') +; + +-- Oct 22, 2015 3:21:49 PM CEST +INSERT INTO AD_TreeNode (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNode_UU) SELECT t.AD_Client_ID, 0, 'Y', statement_timestamp(), 0, statement_timestamp(), 0,t.AD_Tree_ID, 200000, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='TL' AND t.AD_Table_ID=282 AND NOT EXISTS (SELECT * FROM AD_TreeNode e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200000) +; + +-- Oct 22, 2015 3:21:49 PM CEST +ALTER TABLE AD_UserPreference ADD COLUMN ToggleOnDoubleClick CHAR(1) DEFAULT 'N' CHECK (ToggleOnDoubleClick IN ('Y','N')) +; + +-- Oct 22, 2015 3:22:22 PM CEST +INSERT INTO AD_TreeNode (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNode_UU) SELECT t.AD_Client_ID, 0, 'Y', statement_timestamp(), 0, statement_timestamp(), 0,t.AD_Tree_ID, 200001, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='TL' AND t.AD_Table_ID=282 AND NOT EXISTS (SELECT * FROM AD_TreeNode e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200001) +; + +-- Oct 22, 2015 3:22:22 PM CEST +INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,XPosition,ColumnSpan) VALUES (203913,'Toggle on Double Click','Defines if double click in a field on grid mode switch to form view','Defines if double click in a field on grid mode switch to form view',200189,212330,'Y',1,80,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2015-10-22 15:22:22','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2015-10-22 15:22:22','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','606eb6b0-a10e-4807-af1b-a2f7c8519115','Y',80,2,2) +; + +-- Oct 22, 2015 3:22:42 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=60, XPosition=2,Updated=TO_TIMESTAMP('2015-10-22 15:22:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203913 +; + +-- Oct 22, 2015 3:22:42 PM CEST +UPDATE AD_Field SET SeqNo=70,Updated=TO_TIMESTAMP('2015-10-22 15:22:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203800 +; + +-- Oct 22, 2015 3:22:42 PM CEST +UPDATE AD_Field SET SeqNo=80,Updated=TO_TIMESTAMP('2015-10-22 15:22:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203798 +; + +SELECT register_migration_script('201510221522_IDEMPIERE-2896.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java index 35d1eba18e..3a14df4769 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java @@ -246,7 +246,8 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer form.setWidgetAttribute(AdempiereWebUI.WIDGET_INSTANCE_NAME, "form"); listPanel = new GridView(); - listPanel.getListbox().addEventListener(Events.ON_DOUBLE_CLICK, this); + if( "Y".equals(Env.getContext(Env.getCtx(), "ToggleOnDoubleClick")) ) + listPanel.getListbox().addEventListener(Events.ON_DOUBLE_CLICK, this); } @Override