Skip to content

Bug #14387 #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
import org.silverpeas.components.rssaggregator.model.SPChannel;
import org.silverpeas.components.rssaggregator.service.RSSService;
import org.silverpeas.components.rssaggregator.service.RSSServiceProvider;
import org.silverpeas.core.web.util.WebRedirection;
import org.silverpeas.kernel.SilverpeasRuntimeException;
import org.silverpeas.core.admin.component.model.ComponentInst;
import org.silverpeas.core.admin.component.model.ComponentInstLight;
@@ -603,7 +604,7 @@ public BodyPartSettings getBodyPartSettings(HttpServletRequest request) {
BodyPartSettings bodyPartSettings = new BodyPartSettings();

HttpSession session = request.getSession();
String strGoToNew = (String) session.getAttribute("gotoNew");
String strGoToNew = (String) session.getAttribute(WebRedirection.REDIRECT_URL);
String spaceId = request.getParameter("SpaceId");
String subSpaceId = request.getParameter("SubSpaceId");
String fromTopBar = request.getParameter("FromTopBar");
@@ -644,9 +645,9 @@ public BodyPartSettings getBodyPartSettings(HttpServletRequest request) {
displayLoginHomepage, loginHomepage);

session.removeAttribute("goto");
session.removeAttribute("gotoNew");
session.removeAttribute("RedirectToComponentId");
session.removeAttribute("RedirectToSpaceId");
session.removeAttribute(WebRedirection.REDIRECT_URL);
session.removeAttribute(WebRedirection.REDIRECT_TO_COMPONENT);
session.removeAttribute(WebRedirection.REDIRECT_TO_SPACE);

boolean hideMenu = "1".equals(fromTopBar) || "1".equals(login);
if (hideMenu) {
16 changes: 10 additions & 6 deletions aurora/aurora-war/src/main/webapp/look/jsp/MainFrame.jsp
Original file line number Diff line number Diff line change
@@ -3,6 +3,10 @@
<%@ page import="org.silverpeas.kernel.bundle.ResourceLocator" %>
<%@ page import="org.silverpeas.kernel.bundle.LocalizationBundle" %>
<%@ page import="org.silverpeas.core.web.look.LookHelper" %>
<%@ page import="org.silverpeas.core.web.util.WebRedirection" %>
<%@ page import="static org.silverpeas.core.web.util.WebRedirection.REDIRECT_TO_COMPONENT" %>
<%@ page import="static org.silverpeas.core.web.util.WebRedirection.REDIRECT_TO_SPACE" %>
<%@ page import="static org.silverpeas.core.web.util.WebRedirection.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://www.silverpeas.com/tld/viewGenerator" prefix="view"%>
@@ -17,12 +21,12 @@


<%
String componentIdFromRedirect = (String) session.getAttribute("RedirectToComponentId");
String spaceIdFromRedirect = (String) session.getAttribute("RedirectToSpaceId");
String componentIdFromRedirect = (String) session.getAttribute(REDIRECT_TO_COMPONENT);
String spaceIdFromRedirect = (String) session.getAttribute(REDIRECT_TO_SPACE);
if (!StringUtil.isDefined(spaceIdFromRedirect)) {
spaceIdFromRedirect = request.getParameter("RedirectToSpaceId");
spaceIdFromRedirect = request.getParameter(REDIRECT_TO_SPACE);
}
String attachmentId = (String) session.getAttribute("RedirectToAttachmentId");
String attachmentId = (String) session.getAttribute(REDIRECT_TO_ATTACHMENT);
LocalizationBundle generalMessage = ResourceLocator.getGeneralLocalizationBundle(language);
StringBuilder frameBottomParams = new StringBuilder().append("{");
boolean login = StringUtil.getBooleanValue(request.getParameter("Login"));
@@ -73,7 +77,7 @@ if (m_MainSessionCtrl == null) { %>
}

if (!thisFrame.equalsIgnoreCase(helper.getMainFrame())) {
session.setAttribute("RedirectToSpaceId", spaceIdFromRedirect);
session.setAttribute(REDIRECT_TO_SPACE, spaceIdFromRedirect);
%>
<script type="text/javascript">
top.location="<%=helper.getMainFrame()%>";
@@ -154,7 +158,7 @@ if (m_MainSessionCtrl == null) { %>
</view:sp-head-part>
<view:sp-body-part>
<% if (attachmentId != null) {
session.setAttribute("RedirectToAttachmentId", null);
session.setAttribute(REDIRECT_TO_ATTACHMENT, null);
%>
<script type="text/javascript">
SP_openWindow('<%=m_sContext%>/File/<%=attachmentId%>', 'Fichier', '800', '600', 'directories=0,menubar=1,toolbar=1,scrollbars=1,location=1,alwaysRaised');