Changeset 17794

Show
Ignore:
Timestamp:
07/29/08 08:20:46 (2 months ago)
Author:
sjmittal
Message:

fix for 5708
added referer to take back to setup page

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/src/net/project/crossspace/mvc/handler/ShowSharesHandler.java

    r16593 r17794  
    8181     * @throws net.project.base.PnetException if any other error occurred. 
    8282     */ 
    83     public void validateSecurity(int module, int action, String objectID, 
    84         HttpServletRequest request) throws AuthorizationFailedException, PnetException { 
     83    public void validateSecurity(int module, int action, String objectID, HttpServletRequest request) throws AuthorizationFailedException, PnetException { 
    8584    } 
    8685 
    …… 
    112111        listGenerator.setSpaceID(space.getID()); 
    113112        listGenerator.load(); 
    114         model.put("xmlProvider", listGenerator);         
     113        model.put("xmlProvider", listGenerator);       
     114        passThru(model, "referer"); 
    115115 
    116116        return model; 

  • trunk/core/web/jsp/crossspace/ShowShares.jsp

    r17415 r17794  
    3636<jsp:useBean id="xmlProvider" type="net.project.persistence.IXMLPersistence" scope="request" /> 
    3737 
     38<% 
     39    // Save referer or get from request if null 
     40    String referer = request.getParameter("referer"); 
     41    if (referer == null || "".equals(referer)) { 
     42        referer = (String) request.getAttribute("referer"); 
     43    }  
     44    //if still null then set it to schedule main page as default 
     45    if(referer == null || "".equals(referer)) 
     46        referer="/schedule/Main.jsp?module="+Module.SCHEDULE+"&action="+Action.VIEW; 
     47%> 
    3848<template:getDoctype /> 
    3949<html> 
    …… 
    5363<script language="javascript" type="text/javascript"> 
    5464var theForm; 
     65var JSPRootURL = '<%= SessionManager.getJSPRootURL() %>'; 
    5566 
    5667function setup() { 
    …… 
    6677 
    6778function cancel() { 
    68     history.back(); 
     79   self.document.location = JSPRootURL + '/<%=referer%>' + <%=referer.indexOf("?") >= 0 ? "'&'" : "'?'"%> + 'module=<%=net.project.base.Module.PROJECT_SPACE%>'; 
    6980} 
    7081function reset() { 
    …… 
    98109<input type="hidden" name="module" value="<%=Module.SCHEDULE%>"> 
    99110<input type="hidden" name="action" value="<%=Action.DELETE%>"> 
     111<input type="hidden" name="referer" value="<%=referer%>"> 
    100112 
    101113<table border="0" cellpadding="0" cellspacing="0" width="97%"> 

  • trunk/core/web/jsp/project/Setup.jsp

    r17292 r17794  
    181181<display:if name="@prm.crossspace.isenabled"> 
    182182<tr> 
    183 <td class="tableContentFontOnly"><a href="<%=SessionManager.getJSPRootURL()%>/servlet/CrossSpaceController/ShowShares?module=<%=Module.SCHEDULE%>&action=<%=Action.VIEW%>"><%=PropertyProvider.get("prm.project.setup.shares.link")%></td> 
     183<td class="tableContentFontOnly"><a href="<%=SessionManager.getJSPRootURL()%>/servlet/CrossSpaceController/ShowShares?module=<%=Module.SCHEDULE%>&action=<%=Action.VIEW%>&referer=project/Setup.jsp"><%=PropertyProvider.get("prm.project.setup.shares.link")%></td> 
    184184<td class="tableContentFontOnly"><%=PropertyProvider.get("prm.project.setup.channel.shares.label")%></td> 
    185185</tr>