Changeset 7630

Show
Ignore:
Timestamp:
04/28/09 13:25:54 (15 months ago)
Author:
josowski
Message:

If currentIssue is undefined, this page would error out. This resolves that issue.

References #1275

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • head/ambra/webapp/src/main/webapp/article/browseVolume.ftl

    r6168 r7630  
    2424   
    2525  <div id="browse-results" class="tundra"> 
    26      
    27     <h2>Current Issue</h2> 
    28     <div id="issueImage"> 
    29       <div id="thumbnail"> 
    30         <@s.url id="currentIssueURL" action="browseIssue" namespace="/article" 
    31                 issue="${currentIssue.id}" includeParams="none"/> 
    32 <#if currentIssue.imageArticle?exists> 
    33         <@s.url id="currentIssueImgURL" action="fetchObject" namespace="/article"  
    34                 uri="${currentIssue.imageArticle}.g001" representation="PNG_S" includeParams="none"/> 
    35         <a href="${currentIssueURL}"><img alt="Issue Image" src="${currentIssueImgURL}" width="120" height="120" /></a> 
    36 </#if> 
    37         <a href="${currentIssueURL}">${currentIssue.displayName}</a> 
    38         <p>${currentVolume.displayName}</p> 
     26    <#if currentIssue??> 
     27      <h2>Current Issue</h2> 
     28      <div id="issueImage"> 
     29        <div id="thumbnail"> 
     30 
     31          <@s.url id="currentIssueURL" action="browseIssue" namespace="/article" 
     32                  issue="${currentIssue.id}" includeParams="none"/> 
     33  <#if currentIssue.imageArticle?exists> 
     34          <@s.url id="currentIssueImgURL" action="fetchObject" namespace="/article" 
     35                  uri="${currentIssue.imageArticle}.g001" representation="PNG_S" includeParams="none"/> 
     36          <a href="${currentIssueURL}"><img alt="Issue Image" src="${currentIssueImgURL}" width="120" height="120" /></a> 
     37  </#if> 
     38          <a href="${currentIssueURL}">${currentIssue.displayName}</a> 
     39          <p>${currentVolume.displayName}</p> 
     40        </div> 
     41        <h3>About This Image</h3> 
     42        ${currentIssueDescription} 
     43        <div class="clearer">&nbsp;</div> 
    3944      </div> 
    40       <h3>About This Image</h3> 
    41       ${currentIssueDescription} 
    42       <div class="clearer">&nbsp;</div> 
    43     </div> 
     45    </#if> 
    4446     
    4547<#if volumeInfos?exists>