Author: tan_pham_dinh Date: 2009-11-12 23:59:51 -0500 (Thu, 12 Nov 2009) New Revision: 585 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java Log: GTNPORTAL-194: Still show popup messages when deleted all page in Page Management Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2009-11-13 04:50:57 UTC (rev 584) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2009-11-13 04:59:51 UTC (rev 585) @@ -268,10 +268,6 @@ LazyPageList datasource = (LazyPageList)repeater.getDataSource(); int currentPage = datasource.getCurrentPage(); service.remove(page); - uiPageBrowser.defaultValue(uiPageBrowser.getLastQuery()); - if (currentPage > datasource.getAvailablePage()) - currentPage = datasource.getAvailablePage(); - datasource.getPage(currentPage); UIPortal uiPortal = Util.getUIPortal(); if (uiPortal.getSelectedNode().getPageReference().equals(page.getPageId())) @@ -283,6 +279,10 @@ } else { + uiPageBrowser.defaultValue(uiPageBrowser.getLastQuery()); + if (currentPage > datasource.getAvailablePage()) + currentPage = datasource.getAvailablePage(); + datasource.getPage(currentPage); event.getRequestContext().addUIComponentToUpdateByAjax(uiPageBrowser); } }