midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-382 Prevent users to go to detail tabs if link fields are not filled / fix problem with zero ID tables

This commit is contained in:
Carlos Ruiz 2012-09-24 16:31:22 -05:00
parent 1ab3ea6f00
commit 8de7da2ea5
5 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.ui.swing/src/org/compiere/grid/VTabbedPane.java
View File

@ -26,6 +26,7 @@ import org.compiere.apps.ADialog;
import org.compiere.apps.APanel; import org.compiere.apps.APanel;
import org.compiere.model.DataStatusEvent; import org.compiere.model.DataStatusEvent;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.MTable;
import org.compiere.swing.CTabbedPane; import org.compiere.swing.CTabbedPane;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -272,14 +273,15 @@ public class VTabbedPane extends CTabbedPane
if (oldC != null && oldC instanceof GridController) if (oldC != null && oldC instanceof GridController)
{ {
GridController oldGC = (GridController)oldC; GridController oldGC = (GridController)oldC;
int zeroValid = (MTable.isZeroIDTable(oldGC.getMTab().getTableName()) ? 1 : 0);
if ((newGC.getTabLevel() > oldGC.getTabLevel()+1) if ((newGC.getTabLevel() > oldGC.getTabLevel()+1)
|| (newGC.getTabLevel() > oldGC.getTabLevel() && oldGC.getMTab().getRecord_ID() <=0)) // TabLevel increase and parent ID <=0 IDEMPIERE 382 || (newGC.getTabLevel() > oldGC.getTabLevel() && oldGC.getMTab().getRecord_ID()+zeroValid <=0)) // TabLevel increase and parent ID <=0 IDEMPIERE 382
{ {
// validate // validate
// Search for right tab // Search for right tab
GridController rightGC = null; GridController rightGC = null;
//boolean canJump = true; //boolean canJump = true;
boolean canJump = oldGC.getMTab().getRecord_ID() <=0 ? false : true; // IDEMPIERE 382 boolean canJump = oldGC.getMTab().getRecord_ID()+zeroValid <=0 ? false : true; // IDEMPIERE 382
int currentLevel = newGC.getTabLevel(); int currentLevel = newGC.getTabLevel();
for (int i = index-1; i >=0; i--) for (int i = index-1; i >=0; i--)
{ {

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AbstractADTab.java
View File

@ -29,6 +29,7 @@ import org.adempiere.webui.part.AbstractUIPart;
import org.compiere.model.DataStatusEvent; import org.compiere.model.DataStatusEvent;
import org.compiere.model.GridField; import org.compiere.model.GridField;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.MTable;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Evaluator; import org.compiere.util.Evaluator;
@ -242,8 +243,11 @@ public abstract class AbstractADTab extends AbstractUIPart implements IADTab
currentLevel = tabPanel.getTabLevel(); currentLevel = tabPanel.getTabLevel();
} }
} }
if (canJump && checkRecordID && oldTabpanel.getRecord_ID() <= 0) if (canJump && checkRecordID ) {
canJump = false; int zeroValid = (MTable.isZeroIDTable(oldTabpanel.getTableName()) ? 1 : 0);
if (oldTabpanel.getRecord_ID() + zeroValid <= 0)
canJump = false;
}
} }
} }
} }

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java
View File

@ -870,6 +870,11 @@ public class ADSortTab extends Panel implements IADTabpanel
return gridTab.getTabLevel(); return gridTab.getTabLevel();
} }
public String getTableName()
{
return gridTab.getTableName();
}
public int getRecord_ID() { public int getRecord_ID() {
return gridTab.getRecord_ID(); return gridTab.getRecord_ID();
} }

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java
View File

@ -670,6 +670,14 @@ DataStatusListener, IADTabpanel
return gridTab.getTabLevel(); return gridTab.getTabLevel();
} }
/**
* @return The tablename of this Tabpanel
*/
public String getTableName()
{
return gridTab.getTableName();
}
/** /**
* @return The record ID of this Tabpanel * @return The record ID of this Tabpanel
*/ */

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IADTabpanel.java
View File

@ -33,6 +33,11 @@ public interface IADTabpanel extends Component, Evaluatee {
*/ */
public int getTabLevel(); public int getTabLevel();
/**
* @return tablename
*/
public String getTableName();
/** /**
* @return record ID * @return record ID
*/ */