|
From: todd r. <to...@us...> - 2005-03-24 17:08:28
|
Update of /cvsroot/pocolap/pocolap/src/com/pocolap/servlets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4972/src/com/pocolap/servlets Modified Files: HelperFactory.java SelectionHelper.java pocOLAPConstants.java Log Message: Fixed Bug 1169363 - Reset button doesn't work correctly Index: SelectionHelper.java =================================================================== RCS file: /cvsroot/pocolap/pocolap/src/com/pocolap/servlets/SelectionHelper.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SelectionHelper.java 22 Feb 2005 20:15:59 -0000 1.9 --- SelectionHelper.java 24 Mar 2005 17:08:19 -0000 1.10 *************** *** 78,82 **** action = pocOLAPConstants.ACTION_NEW; ! if(action.equalsIgnoreCase(pocOLAPConstants.ACTION_NEW)) { //Might want to make the clearAttributes method a //bit more selective - in the future, we may want --- 78,83 ---- action = pocOLAPConstants.ACTION_NEW; ! if(action.equalsIgnoreCase(pocOLAPConstants.ACTION_NEW) || ! action.equalsIgnoreCase(pocOLAPConstants.ACTION_RESET)) { //Might want to make the clearAttributes method a //bit more selective - in the future, we may want *************** *** 89,93 **** clearAttributes(req); crossTabName = (String)req.getParameter(pocOLAPConstants.ELEMENT_REPT_SELECTOR); ! crosstabdef =null; page = actionNew(crossTabName); --- 90,99 ---- clearAttributes(req); crossTabName = (String)req.getParameter(pocOLAPConstants.ELEMENT_REPT_SELECTOR); ! ! if (action.equalsIgnoreCase(pocOLAPConstants.ACTION_RESET) && ! currDefinition!=null){ ! crossTabName=currDefinition.getCrossTabDef().getRept().getName(); ! } ! crosstabdef =null; page = actionNew(crossTabName); Index: HelperFactory.java =================================================================== RCS file: /cvsroot/pocolap/pocolap/src/com/pocolap/servlets/HelperFactory.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** HelperFactory.java 16 Mar 2005 20:56:29 -0000 1.8 --- HelperFactory.java 24 Mar 2005 17:08:19 -0000 1.9 *************** *** 39,43 **** ServletHelper s = null ; ! if (action.equalsIgnoreCase(pocOLAPConstants.ACTION_NEW)){ s = new SelectionHelper(); }else if(action.startsWith(pocOLAPConstants.ACTION_ACROSS_START)|| --- 39,44 ---- ServletHelper s = null ; ! if (action.equalsIgnoreCase(pocOLAPConstants.ACTION_NEW) || ! action.equalsIgnoreCase(pocOLAPConstants.ACTION_RESET)){ s = new SelectionHelper(); }else if(action.startsWith(pocOLAPConstants.ACTION_ACROSS_START)|| Index: pocOLAPConstants.java =================================================================== RCS file: /cvsroot/pocolap/pocolap/src/com/pocolap/servlets/pocOLAPConstants.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pocOLAPConstants.java 18 Mar 2005 15:53:12 -0000 1.7 --- pocOLAPConstants.java 24 Mar 2005 17:08:19 -0000 1.8 *************** *** 60,63 **** --- 60,64 ---- /*ACTIONs are values of the "action" parameter*/ public static final String ACTION_NEW = "new"; + public static final String ACTION_RESET = "reset"; public static final String ACTION_TEST = "test"; public static final String ACTION_DOWN_START = ELEMENT_SELECTOR_DOWN; |