Merge with 761ce4bfd7b845661e2b62cd0d9601f342eab29c
This commit is contained in:
commit
bce1989d05
|
@ -1389,7 +1389,6 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
|
|||
|
||||
boolean changed = e.isChanged() || e.isInserting();
|
||||
boolean readOnly = adTabbox.getSelectedGridTab().isReadOnly();
|
||||
boolean processed = "Y".equals(Env.getContext(Env.getCtx(), getWindowNo(), "Processed", true));
|
||||
boolean insertRecord = !readOnly;
|
||||
if (!detailTab)
|
||||
{
|
||||
|
@ -1402,7 +1401,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
|
|||
}
|
||||
toolbar.enableNew(!changed && insertRecord && !tabPanel.getGridTab().isSortTab());
|
||||
toolbar.enableRefresh(!changed);
|
||||
toolbar.enableDelete(!changed && !readOnly && !tabPanel.getGridTab().isSortTab() && !processed);
|
||||
toolbar.enableDelete(!changed && !readOnly && !tabPanel.getGridTab().isSortTab());
|
||||
//
|
||||
if (readOnly && adTabbox.getSelectedGridTab().isAlwaysUpdateField())
|
||||
{
|
||||
|
@ -1411,7 +1410,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
|
|||
}
|
||||
else
|
||||
{
|
||||
adTabbox.updateDetailPaneToolbar(changed, readOnly || processed);
|
||||
adTabbox.updateDetailPaneToolbar(changed, readOnly);
|
||||
}
|
||||
toolbar.enableIgnore(adTabbox.needSave(true, false) ||
|
||||
adTabbox.getSelectedGridTab().isNew() ||
|
||||
|
|
Loading…
Reference in New Issue