Changeset 16209

Show
Ignore:
Timestamp:
14/07/08 14:42:39 (1 month ago)
Author:
jakub
Message:

Fixed problem when user returned from login page to link page and information about template name and description were lost.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/intermine/web/main/src/org/intermine/web/struts/TemplateAction.java

    r16168 r16209  
    107107                return mapping.findForward("template"); 
    108108            } else { 
    109                 request.setAttribute("link", link); 
    110                 request.setAttribute("highlightedLink", gen.getHighlightedLink( 
     109                session.setAttribute("link", link); 
     110                session.setAttribute("highlightedLink", gen.getHighlightedLink( 
    111111                        new URLGenerator(request).getPermanentBaseURL(), configuredTmpl)); 
    112112                String title = configuredTmpl.getTitle(); 
    113113                title = title.replace("-->", "&nbsp;<img src=\"images/tmpl_arrow.png\" " 
    114114                        + "style=\"vertical-align:middle\">&nbsp;"); 
    115                 request.setAttribute("pageTitle", title); 
    116                 request.setAttribute("pageDescription", configuredTmpl.getDescription()); 
     115                session.setAttribute("pageTitle", title); 
     116                session.setAttribute("pageDescription", configuredTmpl.getDescription()); 
    117117                return mapping.findForward("serviceLink"); 
    118118            } 

  • trunk/intermine/webapp/main/resources/webapp/serviceLink.jsp

    r16205 r16209  
    44<%-- Page displaying link to webservice. --%> 
    55 
    6 <%@page import="java.net.URLEncoder"%> 
    76<style type="text/css"> 
    87.highlighted { 
    …… 
    3231 
    3332    <c:choose> 
    34         <c:when test="${requestScope.pageTitle != null}"> 
    35             <c:set var="pageTitle" value="${requestScope.pageTitle}"></c:set> 
     33        <c:when test="${pageTitle != null}"> 
     34            <c:set var="pageTitle" value="${pageTitle}"></c:set> 
    3635        </c:when> 
    3736        <c:otherwise> 
    …… 
    4140 
    4241    <h1>${pageTitle}</h1> 
    43     <div>${requestScope.pageDescription}</div> 
     42    <div>${pageDescription}</div> 
    4443     
    4544    <form action=""> 
    …… 
    6160        <textarea style="width:100%;height:100px;"><iframe width=&quot;700&quot; height=&quot;500&quot; frameborder=&quot;1&quot; scrolling=&quot;yes&quot; marginheight=&quot;0&quot; marginwidth=&quot;0&quot; src=&quot;${link}&amp;format=html&quot;></iframe></textarea> 
    6261     
    63        <c:if test="${requestScope.highlightedLink != null}"> 
     62       <c:if test="${highlightedLink != null}"> 
    6463            <div style="margin-top:10px;"> 
    6564               If you want to get results for different parameters, edit the highlighted constraints  
    …… 
    6766            </div> 
    6867            <div id="highLinkId" style="display: none;"> 
    69                ${requestScope.highlightedLink} 
     68               ${highlightedLink} 
    7069            </div> 
    7170        </c:if>