portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html database-browser-portlet.vm
Date Mon, 05 Aug 2002 22:23:15 GMT
taylor      2002/08/05 15:23:15

  Modified:    webapp/WEB-INF/templates/vm/portlets/html
                        database-browser-portlet.vm
  Log:
  Bug Fix. Added if checks for null objects, before calling a method on the objects.
  
  Revision  Changes    Path
  1.12      +32 -29    jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/database-browser-portlet.vm
  
  Index: database-browser-portlet.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/database-browser-portlet.vm,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- database-browser-portlet.vm	16 May 2002 10:47:43 -0000	1.11
  +++ database-browser-portlet.vm	5 Aug 2002 22:23:15 -0000	1.12
  @@ -14,54 +14,57 @@
           <div align="center">$column</div>
         </td>
       #end
  -    #if ($rowLinks.size() > 0)
  -      <td align=CENTER width="43" class="listCellHead"></td>
  +    #if ($rowLinks)
  +        #if ($rowLinks.size() > 0)
  +            <td align=CENTER width="43" class="listCellHead"></td>
  +        #end
       #end
     </tr>
     #foreach ( $row in $table )
     <tr>
       #foreach ( $entry in $row )
  -      #if ($row.firstElement() == $entry)
  +      #if ($velocityCount == 1)
           #set ($rowid = $entry)
         #end
         <td class="listCell" nowrap width="43">
           <div align="center">$entry</div>
         </td>
       #end
  -    #if ($rowLinks.size() > 0)
  -    <td class="listCell" nowrap width="100">
  -      #foreach ($rowLink in $rowLinks)
  -        #set ($rName = $l10n.get($rowLink.Name))
  -        #if($rowLink.Type=="pane")
  -            #set ($link1 = $jslink.setPaneByName($rowLink.Action).addQueryData("js_rowid",$rowid).addQueryData("js_mode",$rName))
  -        #else
  -            #set ($link1 = $jslink.setPage($rowLink.Page).addQueryData("js_rowid",$rowid).addQueryData("js_mode",$rName))
  +    #if ($rowLinks)
  +        #if ($rowLinks.size() > 0)
  +            <td class="listCell" nowrap width="100">
  +            #foreach ($rowLink in $rowLinks)
  +                #set ($rName = $l10n.get($rowLink.Name))
  +                #if($rowLink.Type=="pane")
  +                    #set ($link1 = $jslink.setPaneByName($rowLink.Action).addQueryData("js_rowid",$rowid).addQueryData("js_mode",$rName))
  +                #else
  +                    #set ($link1 = $jslink.setPage($rowLink.Page).addQueryData("js_rowid",$rowid).addQueryData("js_mode",$rName))
  +                #end
  +                <a class="listCell" href='$link1'>$rName</a>&nbsp;
  +            #end
  +            </td>
           #end
  -        <a class="listCell" href='$link1'>$rName</a>
  -        &nbsp;
  -      #end
  -    </td>
       #end
     </tr>
     #end
  -  #if ($tableLinks.size() > 0)
  +  #if ($tableLinks)
  +    #if ($tableLinks.size() > 0)
         <tr>
           <td>&nbsp;
           </td>
         </tr>
  -  <tr>
  -    #foreach ($tableLink in $tableLinks)
  -      #set ($tName = $l10n.get($tableLink.Name) )
  -      #if ($tableLink.Type == "pane")
  -          #set ($link2 = $jslink.setPaneByName($tableLink.Action).addQueryData("js_mode",$tName))
  -      #else
  -          #set ($link2 = $jslink.setPage($tableLink.Page).addQueryData("js_mode",$tName))
  -      #end
  -      <td>
  -        <a href='$link2'>$tName</a>
  -      </td>
  +      <tr>
  +        #foreach ($tableLink in $tableLinks)
  +            #set ($tName = $l10n.get($tableLink.Name) )
  +            #if ($tableLink.Type == "pane")
  +                #set ($link2 = $jslink.setPaneByName($tableLink.Action).addQueryData("js_mode",$tName))
  +            #else
  +                #set ($link2 = $jslink.setPage($tableLink.Page).addQueryData("js_mode",$tName))
  +            #end
  +            <td><a href='$link2'>$tName</a></td>
  +        #end
  +      </tr>
       #end
  -  </tr>
     #end
     </tbody>
   </table>
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message