diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java index ff4fc974a4..46804129e0 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VDate.java @@ -428,7 +428,7 @@ public class VDate extends JComponent // Preference if (e.getActionCommand().equals(ValuePreference.NAME)) { - if (MRole.getDefault().isShowPreference()) + if (MRole.getDefault().isShowPreference() && !m_mField.isEncrypted() && !m_mField.isEncryptedColumn()) ValuePreference.start (m_mField, getValue(), getDisplay()); return; } @@ -563,7 +563,8 @@ public class VDate extends JComponent { m_mField = mField; if (m_mField != null - && MRole.getDefault().isShowPreference()) + && MRole.getDefault().isShowPreference() + && !mField.isEncrypted() && !mField.isEncryptedColumn()) ValuePreference.addMenu (this, popupMenu); if (m_mField != null) FieldRecordInfo.addMenu(this, popupMenu); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java index 4f8b4100a6..3b7b36373a 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java @@ -674,7 +674,8 @@ public class VLookup extends JComponent { m_mField = mField; if (m_mField != null - && MRole.getDefault().isShowPreference()) + && MRole.getDefault().isShowPreference() + && !mField.isEncrypted() && !mField.isEncryptedColumn()) ValuePreference.addMenu (this, popupMenu); if (m_mField != null) @@ -700,7 +701,7 @@ public class VLookup extends JComponent // Preference if (e.getActionCommand().equals(ValuePreference.NAME)) { - if (MRole.getDefault().isShowPreference()) + if (MRole.getDefault().isShowPreference() && !m_mField.isEncrypted() && !m_mField.isEncryptedColumn()) ValuePreference.start (m_mField, getValue(), getDisplay()); return; } diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java index 8e003da6de..a66bd900a3 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java @@ -549,7 +549,7 @@ public final class VNumber extends JComponent log.config(e.getActionCommand()); if (ValuePreference.NAME.equals(e.getActionCommand())) { - if (MRole.getDefault().isShowPreference()) + if (MRole.getDefault().isShowPreference() && !m_mField.isEncrypted() && !m_mField.isEncryptedColumn()) ValuePreference.start (m_mField, getValue()); return; } @@ -758,7 +758,8 @@ public final class VNumber extends JComponent m_mField = mField; if (m_mField != null - && MRole.getDefault().isShowPreference()) + && MRole.getDefault().isShowPreference() + && !mField.isEncrypted() && !mField.isEncryptedColumn()) ValuePreference.addMenu (this, popupMenu); if (m_mField != null) diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java index de5857ff7c..7a9913635c 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VString.java @@ -263,7 +263,7 @@ public final class VString extends CTextField { if (e.getActionCommand().equals(ValuePreference.NAME)) { - if (MRole.getDefault().isShowPreference()) + if (MRole.getDefault().isShowPreference() && !m_mField.isEncrypted() && !m_mField.isEncryptedColumn()) ValuePreference.start (m_mField, getValue()); return; } @@ -298,7 +298,8 @@ public final class VString extends CTextField { m_mField = mField; if (m_mField != null - && MRole.getDefault().isShowPreference()) + && MRole.getDefault().isShowPreference() + && !mField.isEncrypted() && !mField.isEncryptedColumn()) ValuePreference.addMenu (this, popupMenu); if (m_mField != null) FieldRecordInfo.addMenu(this, popupMenu); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java index 25f3e4e346..fcd29700f8 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VURL.java @@ -372,7 +372,7 @@ public class VURL extends JComponent { if (e.getActionCommand().equals(ValuePreference.NAME)) { - if (MRole.getDefault().isShowPreference()) + if (MRole.getDefault().isShowPreference() && !m_mField.isEncrypted() && !m_mField.isEncryptedColumn()) ValuePreference.start (m_mField, getValue()); return; } @@ -436,7 +436,8 @@ public class VURL extends JComponent { m_mField = mField; if (m_mField != null - && MRole.getDefault().isShowPreference()) + && MRole.getDefault().isShowPreference() + && !mField.isEncrypted() && !mField.isEncryptedColumn()) ValuePreference.addMenu (this, popupMenu); if (m_mField != null) FieldRecordInfo.addMenu(this, popupMenu);