Author: vmassol
Date: 2007-11-15 17:20:17 +0100 (Thu, 15 Nov 2007)
New Revision: 5890
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/macros.vm
Log:
XWIKI-1857: Panels from virtual wikis cannot be referenced in the list of Panels
Merged from trunk (rev 5889)
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/macros.vm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/macros.vm
2007-11-15 16:15:40 UTC (rev 5889)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/macros.vm
2007-11-15 16:20:17 UTC (rev 5890)
@@ -44,8 +44,12 @@
###
#macro(displaypanel $name)
#set ($pobj = "")
+ ## Since Velocity does not do any assignment if the RHS is null we need to
reset the paneldoc
+ ## as otherwise the previously set panel will be displayed. getDocument()
returns null if the
+ ## user doesn't have the right to view a document.
+ #set ($paneldoc = "")
#set ($paneldoc = $xwiki.getDocument($name))
- #if ($paneldoc && $paneldoc.fullName==$name)
+ #if ($paneldoc != "")
#set ($pobj = $paneldoc.getObject("Panels.PanelClass"))
#if (!$pobj)
## discarded
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
