gatein SVN: r2744 - portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization.
by do-not-reply@jboss.org
Author: ndkhoiits
Date: 2010-04-22 04:48:42 -0400 (Thu, 22 Apr 2010)
New Revision: 2744
Modified:
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java
Log:
GTNPORTAL-1092 Support some teams has added * into listMemberShip in configuration
Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java 2010-04-22 07:58:57 UTC (rev 2743)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java 2010-04-22 08:48:42 UTC (rev 2744)
@@ -90,7 +90,11 @@
{
listMemberhip.add(((MembershipType)obj).getName());
}
- listMemberhip.add("*");
+ if(listMemberhip.contains("*"))
+ {
+ listMemberhip.add("*");
+ }
+
super.processRender(context);
}
14 years, 8 months
gatein SVN: r2743 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-22 03:58:57 -0400 (Thu, 22 Apr 2010)
New Revision: 2743
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml
Log:
JBEPP-254: Sybase profile information
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml 2010-04-22 07:31:23 UTC (rev 2742)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml 2010-04-22 07:58:57 UTC (rev 2743)
@@ -103,6 +103,14 @@
<para>More information about setting up datasources can be found in the
Enterprise Application Platform documentation.</para>
+
+ <warning>
+ <title>Using Sybase</title>
+ <para>Sybase requires a particular configuration of GateIn, to switch on that configuration, it is
+ mandatory to run the portal with the extra <literal>sybase</literal> profile. This would
+ mean to run the application server with <literal>sh run.sh -Dexo.profiles=sybase</literal> in a single node
+ and <literal>sh run.sh -Dexo.profiles=sybase,cluster</literal> for a cluster node.</para>
+ </warning>
</section>
<section>
14 years, 8 months
gatein SVN: r2742 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply@jboss.org
Author: mvanco(a)redhat.com
Date: 2010-04-22 03:31:23 -0400 (Thu, 22 Apr 2010)
New Revision: 2742
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html
Log:
UI Tests: fixed test SNF_PRL_22 - change back to English on the end of the test
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-04-22 03:51:19 UTC (rev 2741)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-04-22 07:31:23 UTC (rev 2742)
@@ -194,7 +194,7 @@
<tr>
<td>select</td>
<td>locale</td>
- <td>label=French</td>
+ <td>label=English</td>
</tr>
<tr>
<td>click</td>
14 years, 8 months
gatein SVN: r2741 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace.
by do-not-reply@jboss.org
Author: kien_nguyen
Date: 2010-04-21 23:51:19 -0400 (Wed, 21 Apr 2010)
New Revision: 2741
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
Log:
GTNPORTAL-1077 Show message alert You have no right to edit this layout. when edit layout of Dashboard with user [john/demo/mary]
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-04-22 03:13:13 UTC (rev 2740)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-04-22 03:51:19 UTC (rev 2741)
@@ -141,15 +141,20 @@
if (userConfig == null)
userConfig = uiApp.getUserPortalConfig();
- PortalConfig portalConfig = userConfig.getPortalConfig();
-
- UserACL userACL = uiPortal.getApplicationComponent(UserACL.class);
- if (!userACL.hasEditPermission(portalConfig))
+ //Todo nguyenanhkien2a(a)gmail.com
+ //Check editing permission
+ UIPortalApplication portalApp = Util.getUIPortalApplication();
+ UIPortal currentUIPortal = portalApp.<UIWorkingWorkspace>findComponentById(
+ UIPortalApplication.UI_WORKING_WS_ID).findFirstComponentOfType(UIPortal.class);
+ UserACL userACL = portalApp.getApplicationComponent(UserACL.class);
+ if(!userACL.hasEditPermissionOnPortal(currentUIPortal.getOwnerType(), currentUIPortal.getOwner(),
+ currentUIPortal.getEditPermission()))
{
uiApp.addMessage(new ApplicationMessage("UIPortalManagement.msg.Invalid-EditLayout-Permission",
new String[]{uiPortal.getName()}));
return;
}
+
PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
UIWorkingWorkspace uiWorkingWS = uiApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
uiWorkingWS.setBackupUIPortal(uiPortal);
14 years, 8 months
gatein SVN: r2740 - portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization.
by do-not-reply@jboss.org
Author: ndkhoiits
Date: 2010-04-21 23:13:13 -0400 (Wed, 21 Apr 2010)
New Revision: 2740
Modified:
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java
Log:
GTNPORTAL-1092 Init listMemberShip is duplicate in Constructor and processRender
Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java 2010-04-22 01:58:34 UTC (rev 2739)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java 2010-04-22 03:13:13 UTC (rev 2740)
@@ -64,45 +64,14 @@
{
UIBreadcumbs uiBreadcumbs = addChild(UIBreadcumbs.class, "BreadcumbGroupSelector", "BreadcumbGroupSelector");
UITree tree = addChild(UITree.class, "UITreeGroupSelector", "TreeGroupSelector");
- OrganizationService service = getApplicationComponent(OrganizationService.class);
- Collection<?> sibblingsGroup = service.getGroupHandler().findGroups(null);
-
- Collection<?> collection = service.getMembershipTypeHandler().findMembershipTypes();
- listMemberhip = new ArrayList<String>(5);
- for (Object obj : collection)
- {
- listMemberhip.add(((MembershipType)obj).getName());
- }
- listMemberhip.add("*");
-
- tree.setSibbling((List)sibblingsGroup);
tree.setIcon("GroupAdminIcon");
tree.setSelectedIcon("PortalIcon");
tree.setBeanIdField("id");
- //tree.setBeanLabelField("groupName");
tree.setBeanLabelField("label");
uiBreadcumbs.setBreadcumbsStyle("UIExplorerHistoryPath");
}
- /*public void processDecode(WebuiRequestContext context) throws Exception {
- super.processDecode(context);
- UIForm uiForm = getAncestorOfType(UIForm.class);
- String action = null;
- if(uiForm != null){
- action = uiForm.getSubmitAction();
- }else {
- action = context.getRequestParameter(UIForm.ACTION);
- }
- if(action == null) return;
- String componentId = context.getRequestParameter("selectorId") ;
- System.out.println("\n\n\n\n == > tai day ta co "+componentId +"\n\n\n");
- if(componentId != null && componentId.trim().length() > 0 && componentId.equals(getId())) {
- Event<UIComponent> event = createEvent(action, Event.Phase.DECODE, context) ;
- if(event != null) event.broadcast() ;
- }
- }*/
-
/**
* @see org.exoplatform.webui.core.UIComponent#processRender(org.exoplatform.webui.application.WebuiRequestContext)
*/
14 years, 8 months
gatein SVN: r2739 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
by do-not-reply@jboss.org
Author: hoang_to
Date: 2010-04-21 21:58:34 -0400 (Wed, 21 Apr 2010)
New Revision: 2739
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
Log:
GTNPORTAL-1091: Refactor rotten Java code
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-21 20:08:22 UTC (rev 2738)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-22 01:58:34 UTC (rev 2739)
@@ -111,12 +111,11 @@
public void initNavigations(List<PageNavigation> navis) throws Exception
{
navigations = navis;
- // set resolved label for navigations
WebuiRequestContext requestContext = WebuiRequestContext.getCurrentInstance();
localizeNavigation(requestContext.getLocale());
- updateUI();
- selectNavigation();
+ updateNodeTree();
+ initEditedData();
}
public void loadNavigationByNavId(Integer navId, List<PageNavigation> navigations) throws Exception
@@ -128,7 +127,7 @@
selectNavigation(navId);
}
- private void updateUI()
+ private void updateNodeTree()
{
if (navigations == null || navigations.size() < 1)
{
@@ -137,7 +136,11 @@
}
}
- private void selectNavigation()
+ /**
+ * Init the edited node as well as its parent, navigation
+ *
+ */
+ private void initEditedData()
{
if (navigations == null || navigations.size() < 1)
{
@@ -305,7 +308,7 @@
navigations = new ArrayList<PageNavigation>();
}
navigations.add(navigation);
- updateUI();
+ updateNodeTree();
}
public void deletePageNavigation(PageNavigation navigation)
@@ -317,8 +320,8 @@
navigations.remove(navigation);
deleteNavigations.add(navigation);
selectedNode = null;
- selectNavigation();
- updateUI();
+ initEditedData();
+ updateNodeTree();
}
public PageNavigation getPageNavigation(int id)
14 years, 8 months
gatein SVN: r2738 - in portal: tags and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-21 16:08:22 -0400 (Wed, 21 Apr 2010)
New Revision: 2738
Added:
portal/tags/EPP_5_0_0_ER03/
Removed:
portal/branches/EPP_5_0_0_ER03_Branch/
Log:
Cleanup
Copied: portal/tags/EPP_5_0_0_ER03 (from rev 2737, portal/branches/EPP_5_0_0_ER03_Branch)
14 years, 8 months
gatein SVN: r2737 - in portal: tags and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-21 16:05:27 -0400 (Wed, 21 Apr 2010)
New Revision: 2737
Added:
portal/tags/EPP_5_0_0_ER02/
Removed:
portal/branches/EPP_5_0_0_ER02_Branch/
Log:
Cleanup
Copied: portal/tags/EPP_5_0_0_ER02 (from rev 2736, portal/branches/EPP_5_0_0_ER02_Branch)
14 years, 8 months
gatein SVN: r2736 - in portal: tags and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-21 16:04:12 -0400 (Wed, 21 Apr 2010)
New Revision: 2736
Added:
portal/tags/EPP_5_0_0_ER01/
Removed:
portal/branches/EPP_5_0_0_ER01_Branch/
Log:
Cleanup
Copied: portal/tags/EPP_5_0_0_ER01 (from rev 2735, portal/branches/EPP_5_0_0_ER01_Branch)
14 years, 8 months
gatein SVN: r2735 - portal/tags.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-21 16:00:39 -0400 (Wed, 21 Apr 2010)
New Revision: 2735
Added:
portal/tags/EPP_5_0_0_ER04/
Removed:
portal/tags/epp-5.0.0-ER04/
Log:
Shouldn't rename an SVN location, but this is an engineering release
Copied: portal/tags/EPP_5_0_0_ER04 (from rev 2734, portal/tags/epp-5.0.0-ER04)
14 years, 8 months