gatein SVN: r1834 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-02-24 05:08:10 -0500 (Wed, 24 Feb 2010)
New Revision: 1834
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
Log:
GTNPORTAL-622: Show duplicate portlet in special case
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 2010-02-24 10:06:29 UTC (rev 1833)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-02-24 10:08:10 UTC (rev 1834)
@@ -335,7 +335,13 @@
//Switch portal application to edit mode
uiPortalApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
- UIPage uiPage = Util.toUIPage(page, uiPageBrowser);
+ UIWorkingWorkspace uiWorkingWS = uiPortalApp.findFirstComponentOfType(UIWorkingWorkspace.class);
+ UIEditInlineWorkspace editInlineWS = uiWorkingWS.getChild(UIEditInlineWorkspace.class);
+
+ //Clone a UIPage object, that is required for Abort action
+ UIPage uiPage = editInlineWS.createUIComponent(UIPage.class, null, null);
+ PortalDataMapper.toUIPage(uiPage, page);
+
UIPageBody uiPageBody = uiPortalApp.findFirstComponentOfType(UIPageBody.class);
if (uiPageBody.getUIComponent() != null)
uiPageBody.setUIComponent(null);
@@ -351,9 +357,6 @@
return;
}
- uiPortalApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
- UIWorkingWorkspace uiWorkingWS = uiPortalApp.findFirstComponentOfType(UIWorkingWorkspace.class);
- UIEditInlineWorkspace editInlineWS = uiWorkingWS.getChild(UIEditInlineWorkspace.class);
editInlineWS.setRendered(true);
editInlineWS.setUIComponent(uiPage);
14 years, 10 months
gatein SVN: r1833 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-02-24 05:06:29 -0500 (Wed, 24 Feb 2010)
New Revision: 1833
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
Log:
Update code to fix error while deleting portlet
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-24 09:42:24 UTC (rev 1832)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-24 10:06:29 UTC (rev 1833)
@@ -90,6 +90,10 @@
UIPage newUIPage = uiWorkingWS.createUIComponent(UIPage.class, null, null);
PortalDataMapper.toUIPage(newUIPage, page);
uiToolPanel.setWorkingComponent(newUIPage);
+
+ // Remove current UIPage from UIPageBody
+ pageBody.setUIComponent(null);
+
event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
Util.getPortalRequestContext().setFullRender(true);
}
14 years, 10 months
gatein SVN: r1832 - in portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium: issues and 1 other directories.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2010-02-24 04:42:24 -0500 (Wed, 24 Feb 2010)
New Revision: 1832
Added:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_19.html
Removed:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_19.html
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html
Log:
GTNPORTAL-509: Selenium SniffTests
* 19 in ko until a bug is entered or not
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-24 09:18:00 UTC (rev 1831)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/TestSuite_SNF_PRL.html 2010-02-24 09:42:24 UTC (rev 1832)
@@ -37,11 +37,11 @@
<tr><td><a href="ko/Test_SNF_PRL_27.html">SNF_PRL_27 Not working</a></td></tr>
<tr><td><a href="ko/Test_SNF_PRL_29.html">SNF_PRL_29 Not working</a></td></tr>
<tr><td><a href="ko/Test_SNF_PRL_30.html">SNF_PRL_30 Not working</a></td></tr>
+<tr><td><a href="ko/Test_SNF_PRL_19.html">SNF_PRL_19 On tomcat to confirm</a></td></tr>
<tr><td><a href="issues/Test_SNF_PRL_06.html">SNF_PRL_06 GTNPORTAL-270</a></td></tr>
<tr><td><a href="issues/Test_SNF_PRL_13.html">SNF_PRL_13 GTNPORTAL-439</a></td></tr>
-<tr><td><a href="issues/Test_SNF_PRL_19.html">SNF_PRL_19 On tomcat to confirm</a></td></tr>
-<tr><td><a href="issues/Test_SNF_PRL_23.html">SNF_PRL_23 GroupNavigation elements order not stable</a></td></tr>
-<tr><td><a href="issues/Test_SNF_PRL_24.html">SNF_PRL_24 GroupNavigation elements order not stable</a></td></tr>
+<tr><td><a href="issues/Test_SNF_PRL_23.html">SNF_PRL_23 GTNPORTAL-717 GroupNavigation elements order not stable</a></td></tr>
+<tr><td><a href="issues/Test_SNF_PRL_24.html">SNF_PRL_24 GTNPORTAL-717 GroupNavigation elements order not stable</a></td></tr>
</tbody></table>
</body>
</html>
Deleted: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_19.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_19.html 2010-02-24 09:18:00 UTC (rev 1831)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_19.html 2010-02-24 09:42:24 UTC (rev 1832)
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>SNF_PRL_19</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">SNF_PRL_19</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/portal/public/classic/</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>-EditPortalNavigation-</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Sign in</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>username</td>
- <td>root</td>
-</tr>
-<tr>
- <td>type</td>
- <td>username</td>
- <td>root</td>
-</tr>
-<tr>
- <td>type</td>
- <td>password</td>
- <td>gtn</td>
-</tr>
-<tr>
- <td>clickAndWait</td>
- <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Site</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Edit Portal layout, currently do not change anything</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//a[@class='EditLayoutIcon']</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//a[@class='EditLayoutIcon']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>css=div#Administration/ApplicationRegistryPortlet</td>
- <td></td>
-</tr>
-<tr>
- <td>dragAndDropToObject</td>
- <td>css=div#Administration/ApplicationRegistryPortlet</td>
- <td>css=div#UIPortal div.UIRowContainer</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='EdittedSaveButton']</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='CloseButton']</td>
- <td>1,1</td>
-</tr>
-<tr>
- <td>waitForTextPresent</td>
- <td>classic</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Edit nav: add node, actions ...</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Edit Navigation</td>
- <td>1,1</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Add Node</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Add Node</td>
- <td>1,1</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>name</td>
- <td></td>
-</tr>
-<tr>
- <td>type</td>
- <td>name</td>
- <td>test_nodename_19</td>
-</tr>
-<tr>
- <td>type</td>
- <td>label</td>
- <td>test_node_label_19</td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Select Page</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>css=div#UISiteManagement > div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td>
- <td>1,1</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Search and Select Page</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Search and Select Page</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Select the first page</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Save</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Save</td>
- <td>1,1</td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Save</td>
- <td>1,1</td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Edit Portal Properties</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Edit Portal's Properties</td>
- <td>1,1</td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Edit Portal's Properties</td>
- <td>1,1</td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Edit Permission Setting</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Edit Permission Setting</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Select Permission</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Select Permission</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Platform</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Platform</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Administrators</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Administrators</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//div[@id='PermissionSelector']//div[2]/a</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']</td>
- <td></td>
-</tr>
-<tr>
- <td>open</td>
- <td>/portal/private/classic/</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Select new node</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=test_node_label_19</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=test_node_label_19</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyElementPresent</td>
- <td>//div[@class='SelectedNavigationTab']//a</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Delete node</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Site</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Site</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Edit Navigation</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Edit Navigation</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>//div[@id='UINavigationManagement']</td>
- <td></td>
-</tr>
-<tr>
- <td>componentExoContextMenu</td>
- <td>//a[@title='test_node_label_19']</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForConfirmation</td>
- <td>Are you sure you want to delete this node?</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Save</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Save</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
- <td>--Verify Deletion</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForElementPresent</td>
- <td>link=Home</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Home</td>
- <td></td>
-</tr>
-<tr>
- <td>waitForTextPresent</td>
- <td>Demo</td>
- <td></td>
-</tr>
-<tr>
- <td>verifyTextNotPresent</td>
- <td>test_node_label_19</td>
- <td></td>
-</tr>
-<tr>
- <td>clickAt</td>
- <td>link=Sign out</td>
- <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
Copied: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_19.html (from rev 1831, portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_19.html)
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_19.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_19.html 2010-02-24 09:42:24 UTC (rev 1832)
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>SNF_PRL_19</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">SNF_PRL_19</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-EditPortalNavigation-</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Edit Portal layout, currently do not change anything</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@class='EditLayoutIcon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//a[@class='EditLayoutIcon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>css=div#Administration/ApplicationRegistryPortlet</td>
+ <td></td>
+</tr>
+<tr>
+ <td>dragAndDropToObject</td>
+ <td>css=div#Administration/ApplicationRegistryPortlet</td>
+ <td>css=div#UIPortal div.UIRowContainer</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='EdittedSaveButton']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UIPortalComposer']//div[@class='OverflowContainer']/a[@class='CloseButton']</td>
+ <td>1,1</td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>classic</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Edit nav: add node, actions ...</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td>1,1</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Add Node</td>
+ <td>1,1</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>test_nodename_19</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>label</td>
+ <td>test_node_label_19</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>css=div#UISiteManagement > div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td>
+ <td>1,1</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Search and Select Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Select the first page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIRepeater']//table//tbody/tr/td[5]/div[@class='ActionContainer']/img</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td>1,1</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td>1,1</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Edit Portal Properties</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Portal's Properties</td>
+ <td>1,1</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Portal's Properties</td>
+ <td>1,1</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UIMaskWorkspace']//div[3]//div[@class='MiddleTab']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Select Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Select Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Platform</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Platform</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Administrators</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Administrators</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='PermissionSelector']//div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>open</td>
+ <td>/portal/private/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Select new node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=test_node_label_19</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=test_node_label_19</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>//div[@class='SelectedNavigationTab']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UINavigationManagement']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>componentExoContextMenu</td>
+ <td>//a[@title='test_node_label_19']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForConfirmation</td>
+ <td>Are you sure you want to delete this node?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify Deletion</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Home</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Home</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Demo</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextNotPresent</td>
+ <td>test_node_label_19</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
14 years, 10 months
gatein SVN: r1831 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-02-24 04:18:00 -0500 (Wed, 24 Feb 2010)
New Revision: 1831
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageTemplateOptions.gtmpl
Log:
GTNPORTAL-478: Error UI in Page Layout form when create new page in Manage Page with Spanish language
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageTemplateOptions.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageTemplateOptions.gtmpl 2010-02-24 08:33:33 UTC (rev 1830)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageTemplateOptions.gtmpl 2010-02-24 09:18:00 UTC (rev 1831)
@@ -73,7 +73,7 @@
<div class="ItemDetailList" style="display: $display;">
<div class="ItemDetailTitle ClearFix">
<div class="TitleIcon ViewListIcon"><span></span></div>
- <div class="Title">fjng ls glfjsd gsd jkg fsdkslkjd kdh kfsdh l sd dd gsdf gsdfgd<%=_ctx.appRes("UIItemSelector.lable.ItemDetailTitle")%></div>
+ <div class="Title"><%=_ctx.appRes("UIItemSelector.lable.ItemDetailTitle")%></div>
</div>
<%
//int i = 0;
14 years, 10 months
gatein SVN: r1830 - in portal/trunk/web: portal/src/main/webapp/groovy/portal/webui/page and 1 other directory.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-02-24 03:33:33 -0500 (Wed, 24 Feb 2010)
New Revision: 1830
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageTemplateOptions.gtmpl
Log:
GTNPORTAL-478: Error UI in Page Layout form when create new page in Manage Page with Spanish language
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css 2010-02-24 07:00:16 UTC (rev 1829)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css 2010-02-24 08:33:33 UTC (rev 1830)
@@ -151,7 +151,8 @@
}
.UIItemSelector .RightColumnStyle .Title {
- line-height: 22px;
+ line-height: 22px; white-space: nowrap;
+ width: 300px; overflow: hidden;
font-weight: bold; color: #5c5c5c;
float: left; /* orientation=lt */
float: right; /* orientation=rt */
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageTemplateOptions.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageTemplateOptions.gtmpl 2010-02-24 07:00:16 UTC (rev 1829)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageTemplateOptions.gtmpl 2010-02-24 08:33:33 UTC (rev 1830)
@@ -71,10 +71,9 @@
templates = category.getSelectItemOptions();
%>
<div class="ItemDetailList" style="display: $display;">
- <div class="ItemDetailTitle">
+ <div class="ItemDetailTitle ClearFix">
<div class="TitleIcon ViewListIcon"><span></span></div>
- <div class="Title"><%=_ctx.appRes("UIItemSelector.lable.ItemDetailTitle")%></div>
- <div class="ClearLeft"><span></span></div>
+ <div class="Title">fjng ls glfjsd gsd jkg fsdkslkjd kdh kfsdh l sd dd gsdf gsdfgd<%=_ctx.appRes("UIItemSelector.lable.ItemDetailTitle")%></div>
</div>
<%
//int i = 0;
14 years, 10 months
gatein SVN: r1829 - in portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui: workspace and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-02-24 02:00:16 -0500 (Wed, 24 Feb 2010)
New Revision: 1829
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
Log:
GTNPORTAL-637: Show exception when edit page in special case
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-24 04:55:24 UTC (rev 1828)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-24 07:00:16 UTC (rev 1829)
@@ -644,13 +644,17 @@
return;
}
- // Perform mop update
+ // Perform model update
DataStorage dataService = uiWorkingWS.getApplicationComponent(DataStorage.class);
dataService.save(page);
uiToolPanel.setUIComponent(null);
+ // Synchronize model object with UIPage object, that seems redundant but in fact
+ // mandatory to have consequent edit actions (on the same page) work properly
+ page = dataService.getPage(page.getPageId());
uiPage.getChildren().clear();
PortalDataMapper.toUIPage(uiPage, page);
+
// Update UIPage cache on UIPortal
uiPortal.setUIPage(pageId, uiPage);
uiPortal.refreshUIPage();
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-24 04:55:24 UTC (rev 1828)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-24 07:00:16 UTC (rev 1829)
@@ -85,7 +85,9 @@
uiToolPanel.setShowMaskLayer(false);
uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
- UIPage newUIPage = new UIPage();
+ // We clone the edited UIPage object, that is required for Abort action
+ //UIPage newUIPage = new UIPage();
+ UIPage newUIPage = uiWorkingWS.createUIComponent(UIPage.class, null, null);
PortalDataMapper.toUIPage(newUIPage, page);
uiToolPanel.setWorkingComponent(newUIPage);
event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS);
14 years, 10 months
gatein SVN: r1828 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-23 23:55:24 -0500 (Tue, 23 Feb 2010)
New Revision: 1828
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java
Log:
GTNPORTAL-566 Unknown error when delete gadget which was deleted
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2010-02-24 03:50:15 UTC (rev 1827)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIApplicationOrganizer.java 2010-02-24 04:55:24 UTC (rev 1828)
@@ -132,6 +132,7 @@
public void setSelectedCategory(ApplicationCategory category) throws Exception
{
selectedCategory = category;
+ if (category == null) return;
applications = category.getApplications();
if (applications == null || applications.isEmpty())
{
14 years, 10 months
gatein SVN: r1827 - in portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin: webui/component/UIBarDecorator/UIInfoBar and 1 other directory.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-02-23 22:50:15 -0500 (Tue, 23 Feb 2010)
New Revision: 1827
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css
Log:
GTNPORTAL-427: Error UI in Portlet Icon when portlet title have max length
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css 2010-02-23 19:45:43 UTC (rev 1826)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPage/Stylesheet.css 2010-02-24 03:50:15 UTC (rev 1827)
@@ -32,8 +32,7 @@
background: url('background/ViewPage.gif') no-repeat left -113px; /* orientation=lt */
background: url('background/ViewPage-rt.gif') no-repeat right -113px; /* orientation=rt */
padding: 0px 0px 0px 143px; /* orientation=lt */
- padding: 0px 143px 0px 0px; /* orientation=rt */
- height: 100%;
+ padding: 0px 143px 0px 0px; /* orientation=rt */
}
.UIPageBody .PageLayoutDecorator .TopRightPage {
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2010-02-23 19:45:43 UTC (rev 1826)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIBarDecorator/UIInfoBar/Stylesheet.css 2010-02-24 03:50:15 UTC (rev 1827)
@@ -80,7 +80,7 @@
.UIInfoBar .BlueRoundedStyle .FixHeight {
height: 26px;
- *width: 230px;
+ *width: 270px;
white-space: nowrap;
}
14 years, 10 months
gatein SVN: r1826 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-02-23 14:45:43 -0500 (Tue, 23 Feb 2010)
New Revision: 1826
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
Log:
GTNPORTAL-699: Check if the default portal name is explicitly set by an extension before overriding the value set in the portal. This will prevent the sample extension from always overriding the default portal name.
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2010-02-23 18:00:04 UTC (rev 1825)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2010-02-23 19:45:43 UTC (rev 1826)
@@ -68,6 +68,12 @@
private String pageTemplatesLocation_;
private String defaultPortal;
+
+ /**
+ * If true the default portal name has been explicitly set.
+ * If false the name has not been set and we are using the default.
+ */
+ private boolean defaultPortalSpecified = false;
private boolean isUseTryCatch;
@@ -83,12 +89,21 @@
if (valueParam != null)
pageTemplatesLocation_ = valueParam.getValue();
- defaultPortal = "classic";
valueParam = params.getValueParam("default.portal");
if (valueParam != null)
+ {
defaultPortal = valueParam.getValue();
+ }
+
if (defaultPortal == null || defaultPortal.trim().length() == 0)
+ {
defaultPortal = "classic";
+ }
+ else
+ {
+ defaultPortalSpecified = true;
+ }
+
configs = params.getObjectParamValues(NewPortalConfig.class);
templateConfigs = params.getObjectParamValues(SiteConfigTemplates.class);
@@ -230,7 +245,14 @@
*/
public void mergePlugin(NewPortalConfigListener other)
{
- this.defaultPortal = other.defaultPortal;
+ //if other didn't actually set anything for the default portal name
+ //then we should continue to use the current value. This way if an extension
+ //doesn't set it, it wont override the parent's set value.
+ if (other.defaultPortalSpecified)
+ {
+ this.defaultPortal = other.defaultPortal;
+ }
+
if (configs == null)
{
this.configs = other.configs;
14 years, 10 months
gatein SVN: r1825 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-23 13:00:04 -0500 (Tue, 23 Feb 2010)
New Revision: 1825
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
Log:
- GTNPORTAL-737: forgot to properly persist the fact that we had a cloned context.
- Fixed an issue where we could get a ClassCastException when updating WSRP state (actually, this is still not quite clear why this happens).
- Added note after investigating consumer-side management of clones to revisit current design as it's not adapted to support that use case.
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2010-02-23 16:55:05 UTC (rev 1824)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2010-02-23 18:00:04 UTC (rev 1825)
@@ -24,7 +24,6 @@
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.model.ApplicationState;
import org.exoplatform.portal.config.model.ApplicationType;
-import org.exoplatform.portal.config.model.PersistentApplicationState;
import org.exoplatform.portal.config.model.TransientApplicationState;
import org.exoplatform.portal.pc.ExoPortletState;
import org.exoplatform.portal.pc.ExoPortletStateType;
@@ -200,6 +199,13 @@
}
};
+ /**
+ * todo: this ModelAdapter is not quite good, what is really needed is a ModelAdapter<WSRP, byte[]> so that the
+ * StatefulPortletContext returned by getPortletContext is actually of type PortletStateType.OPAQUE so that it
+ * can be properly handled in WSRP...
+ * This model needs to be revisited if we want to properly support consumer-side state management.
+ * See GTNPORTAL-736.
+ */
private static final ModelAdapter<WSRP, WSRP> WSRP = new ModelAdapter<WSRP, WSRP>()
{
@Override
@@ -222,8 +228,10 @@
WSRP wsrp = dataStorage.load(state, ApplicationType.WSRP_PORTLET);
if (wsrp == null)
{
+ // create and save state
wsrp = new WSRP();
wsrp.setPortletId(applicationId);
+ dataStorage.save(state, wsrp);
}
return StatefulPortletContext.create(wsrp.getPortletId(), WSRPPortletStateType.instance, wsrp);
}
@@ -240,9 +248,10 @@
}
else
{
- PersistentApplicationState<WSRP> persistentState = (PersistentApplicationState<WSRP>)state;
+ //todo: it is possible to get a CloneApplicationState for some reason, need to investigate
+
DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class);
- return dataStorage.save(persistentState, updateState);
+ return dataStorage.save(state, updateState);
}
}
};
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-02-23 16:55:05 UTC (rev 1824)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-02-23 18:00:04 UTC (rev 1825)
@@ -742,6 +742,8 @@
{
WSRP wsrp = (WSRP)preferencesPortletContext.getState();
AccessMode accessMode = AccessMode.CLONE_BEFORE_WRITE;
+
+ // if the portlet is a cloned one already, we can modify it directly instead of requesting a clone
if (wsrp.isCloned())
{
accessMode = AccessMode.READ_WRITE;
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-02-23 16:55:05 UTC (rev 1824)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-02-23 18:00:04 UTC (rev 1825)
@@ -114,6 +114,7 @@
{
WSRP wsrp = new WSRP();
wsrp.setPortletId(clonedContext.getId());
+ wsrp.setCloned(true); // mark the state as cloned
// if we have an associated state, record it as well...
if (clonedContext instanceof StatefulPortletContext)
14 years, 10 months