diff --git a/migration/i2.0z/oracle/201405291802_IDEMPIERE-1334.sql b/migration/i2.0z/oracle/201405291802_IDEMPIERE-1334.sql new file mode 100644 index 0000000000..7c08f6c4b1 --- /dev/null +++ b/migration/i2.0z/oracle/201405291802_IDEMPIERE-1334.sql @@ -0,0 +1,35 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- May 29, 2014 6:00:45 PM COT +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Column SET IsIdentifier='Y', SeqNo=1,Updated=TO_DATE('2014-05-29 18:00:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=211254 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=203030 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=203036 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=203035 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=203037 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=203038 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=203031 +; + +SELECT register_migration_script('201405291802_IDEMPIERE-1334.sql') FROM dual +; + diff --git a/migration/i2.0z/postgresql/201405291802_IDEMPIERE-1334.sql b/migration/i2.0z/postgresql/201405291802_IDEMPIERE-1334.sql new file mode 100644 index 0000000000..68d21270ec --- /dev/null +++ b/migration/i2.0z/postgresql/201405291802_IDEMPIERE-1334.sql @@ -0,0 +1,32 @@ +-- May 29, 2014 6:00:45 PM COT +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +UPDATE AD_Column SET IsIdentifier='Y', SeqNo=1,Updated=TO_TIMESTAMP('2014-05-29 18:00:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=211254 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=203030 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=203036 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=203035 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=203037 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=203038 +; + +-- May 29, 2014 6:02:16 PM COT +UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=203031 +; + +SELECT register_migration_script('201405291802_IDEMPIERE-1334.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java index 5e55528c03..17f83277af 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java @@ -19,6 +19,7 @@ package org.compiere.model; import java.sql.ResultSet; import java.util.Properties; +import org.compiere.util.KeyNamePair; /** Generated Model for AD_InfoProcess * @author iDempiere (generated) @@ -165,6 +166,14 @@ public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persiste return ii.intValue(); } + /** Get Record ID/ColumnName + @return ID/ColumnName pair + */ + public KeyNamePair getKeyNamePair() + { + return new KeyNamePair(get_ID(), String.valueOf(getAD_Process_ID())); + } + /** Set Image URL. @param ImageURL URL of image diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index 07835bbf7b..073e580d83 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -97,7 +97,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL /** * */ - private static final long serialVersionUID = -3154640457502223300L; + private static final long serialVersionUID = 1958501982483183179L; protected Grid parameterGrid; private Borderlayout layout; @@ -218,6 +218,11 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL } process = MProcess.get(Env.getCtx(), infoProcess.getAD_Process_ID()); Button btProcess = confirmPanel.addProcessButton(process.get_Translation(MProcess.COLUMNNAME_Name), infoProcess.getImageURL()); + if (Util.isEmpty(infoProcess.getImageURL(), true)) { + btProcess.setImage(null); + btProcess.setLabel(process.get_Translation(MProcess.COLUMNNAME_Name)); + } + // save process_id, handle event will use btProcess.setAttribute(PROCESS_ID_KEY, new Integer(infoProcess.getAD_Process_ID())); btProcess.addEventListener(Events.ON_CLICK, this); @@ -246,8 +251,8 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL MProcess process = MProcess.get(Env.getCtx(), data.getAD_Process_ID()); item.setValue(process); item.setLabel(process.get_Translation(MProcess.COLUMNNAME_Name)); - if (data.getImageURL() != null && data.getImageURL().trim().length() > 0){ - item.setImage(ThemeManager.getThemeResource("images/" + data.getImageURL() + ".png")); + if (!Util.isEmpty(data.getImageURL(), true)) { + item.setImage(ThemeManager.getThemeResource("images/" + data.getImageURL())); } } }); @@ -286,8 +291,8 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL // make menu item for each info process Menuitem ipMenuItem = new Menuitem(); ipMenuItem.setLabel(process.get_Translation(MProcess.COLUMNNAME_Name)); - if (infoProcess.getImageURL() != null && infoProcess.getImageURL().trim().length() > 0){ - ipMenuItem.setImage(ThemeManager.getThemeResource("images/" + infoProcess.getImageURL() + ".png")); + if (!Util.isEmpty(infoProcess.getImageURL(), true)) { + ipMenuItem.setImage(ThemeManager.getThemeResource("images/" + infoProcess.getImageURL())); } ipMenuItem.setAttribute(PROCESS_ID_KEY, infoProcess.getAD_Process_ID()); ipMenuItem.addEventListener(Events.ON_CLICK, this); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java index 9036c0081c..3125ad2a6b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java @@ -104,7 +104,7 @@ public abstract class InfoPanel extends Window implements EventListener, /** * */ - private static final long serialVersionUID = -8099535175635558899L; + private static final long serialVersionUID = 7396541753653210881L; private final static int PAGE_SIZE = 100; protected List