Attachment 602093 Details for Bug 842363 – Bug 842363 patch

Bug 842363 patch

bz842363-patch.txt (text/plain), 3.23 KB, created by Peter Palaga on 2012-08-03 09:04:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Palaga

Created: 2012-08-03 09:04:48 UTC

Size: 3.23 KB

patch

obsolete

>Index: web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposerContent.gtmpl
>===================================================================
>--- web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposerContent.gtmpl	(revision 8806)
>+++ web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposerContent.gtmpl	(working copy)
>@@ -20,7 +20,7 @@
> 				<div class="<%= appList.getId().equals(selTabId) ? "SelectedTab" : "NormalTab" %>">
> 					<div class="LeftTab">
> 						<div class="RightTab">
>-							<% String appLink = "ajaxAsyncGetRequest('" + uicomponent.url("SelectTab",appList.getId()) + "', true)" %>								
>+							<% String appLink = "ajaxGet('" + uicomponent.url("SelectTab",appList.getId()) + "&ajaxRequest=true', true)" %>								
> 							<div class="MiddleTab" onclick="eXo.webui.UIHorizontalTabs.changeTabForUITabPane(this, '${appList.getId()}', '$url');$appLink;if(eXo.portal.portalMode) eXo.portal.portalMode -= 2;">
> 								<%=_ctx.appRes("UITabPane.title." + appList.getId());%>
> 							</div>
>@@ -32,7 +32,7 @@
> 				<div class="<%= contList.getId().equals(selTabId) ? "SelectedTab" : "NormalTab" %>">
> 					<div class="LeftTab">
> 						<div class="RightTab">
>-							<% String contLink = "ajaxAsyncGetRequest('" + uicomponent.url("SelectTab",contList.getId()) + "', true)" %>								
>+							<% String contLink = "ajaxGet('" + uicomponent.url("SelectTab",contList.getId()) + "&ajaxRequest=true', true)" %>								
> 							<div class="MiddleTab" onclick="eXo.webui.UIHorizontalTabs.changeTabForUITabPane(this, '${contList.getId()}', '$url');$contLink;if(eXo.portal.portalMode) eXo.portal.portalMode += 2;">
> 								<%=_ctx.appRes("UITabPane.title." + contList.getId());%>
> 							</div>
>Index: webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
>===================================================================
>--- webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java	(revision 8806)
>+++ webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java	(working copy)
>@@ -313,12 +313,12 @@
>          switch(portalMode)
>          {
>             case UIPortalApplication.APP_BLOCK_EDIT_MODE:
>-            case UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE:
>+            case UIPortalApplication.APP_VIEW_EDIT_MODE:
>                Util.showComponentLayoutMode(UIPortlet.class);
>                break;
>-            case UIPortalApplication.APP_VIEW_EDIT_MODE:
>+            case UIPortalApplication.CONTAINER_BLOCK_EDIT_MODE:
>             case UIPortalApplication.CONTAINER_VIEW_EDIT_MODE:
>-               Util.showComponentEditInViewMode(UIPortlet.class);
>+               Util.showComponentLayoutMode(org.exoplatform.portal.webui.container.UIContainer.class);
>                break;
>          }
>       }
>@@ -529,6 +529,9 @@
>       public void execute(Event<UITabPane> event) throws Exception
>       {
>          super.execute(event);
>+         WebuiRequestContext context = event.getRequestContext();
>+         context.setResponseComplete(false);
>+
>          UITabPane uiTabPane = event.getSource();
>          UIComponent uiComponent = uiTabPane.getChildById(uiTabPane.getSelectedTabId());
>          UIPortalApplication uiPortalApp = Util.getUIPortalApplication();

Flags:

ppalaga: review-

Actions: View

Attachments on bug 842363: 599810 | 599811 | 602093