|
From: Michael K. <ko...@us...> - 2006-01-03 09:37:49
|
Update of /cvsroot/cobricks/cobricks2/web/item In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22820/item Modified Files: index.html.en itemlist.html.en itemsearch.html.en Log Message: Index: itemlist.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/item/itemlist.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- itemlist.html.en 10 Aug 2005 12:57:41 -0000 1.1 +++ itemlist.html.en 3 Jan 2006 09:37:39 -0000 1.2 @@ -21,8 +21,15 @@ <p> <ul> #foreach ($i in $itemManager.searchItems($itemPresenter.constructSearchXPath($portalRequest))) -<li>$!i.getId(): $!i.getTitle() - -<a href="itemupdate.html?itemid=$i.getId()">edit</a>, <a href="/ITEM?cmd=deleteitem&cmd.success=/item/itemlist.html&cmd.error=/item/itemlist.html&itemid=$i.getId()&itemclass=$!itemclass">delete</a> +<li>$!i.getId(): $!i.getTitle() +#set ( $accedit = $userPresenter.checkPermission($userId, "item", "update", $i) ) +#set ( $accdel = $userPresenter.checkPermission($userId, "item", "delete", $i) ) +#if ( "$!accedit" == "true" ) +- <a href="itemupdate.html?itemid=$i.getId()">edit</a> +#end +#if ( "$!accdel" == "true" ) +- <a href="/ITEM?cmd=deleteitem&cmd.success=/item/itemlist.html&cmd.error=/item/itemlist.html&itemid=$i.getId()&itemclass=$!itemclass">delete</a> +#end #end </ul> Index: itemsearch.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/item/itemsearch.html.en,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- itemsearch.html.en 10 Aug 2005 12:57:41 -0000 1.1 +++ itemsearch.html.en 3 Jan 2006 09:37:39 -0000 1.2 @@ -26,8 +26,17 @@ #if ($title) <li><a href="item.html?itemid=$item.getId()&fromSearch=true">$title</a></li> #else - <li><a href="item.html?itemid=$item.getId()&fromSearch=true">No title specified for this item</a></li> + <li><a href="item.html?itemid=$item.getId()&fromSearch=true">No title specified for this item</a> #end +#set ( $accedit = $userPresenter.checkPermission($userId, "item", "update", $i) ) +#set ( $accdel = $userPresenter.checkPermission($userId, "item", "delete", $i) ) +#if ( "$!accedit" == "true" ) +- <a href="itemupdate.html?itemid=$i.getId()">edit</a> +#end +#if ( "$!accdel" == "true" ) +- <a href="/ITEM?cmd=deleteitem&cmd.success=/item/itemlist.html&cmd.error=/item/itemlist.html&itemid=$i.getId()&itemclass=$!itemclass">delete</a> +#end + </li> #end </ul> #end Index: index.html.en =================================================================== RCS file: /cvsroot/cobricks/cobricks2/web/item/index.html.en,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- index.html.en 13 Dec 2005 09:05:54 -0000 1.12 +++ index.html.en 3 Jan 2006 09:37:39 -0000 1.13 @@ -30,7 +30,7 @@ <li><a href="itemlist.html?itemclass=msg">Item list - itemclass=msg</a></li> <li><a href="itemlist.html?itemclass=date">Item list - itemclass=date</a></li> <li><a href="itemlist.html?itemclass=portalpagehtml">Item list - itemclass=portalpagehtml</a></li> -<li><a href="itemsearch.html">Search for an item</a></li> +<li><a href="itemsearch.html">Search for items</a></li> </ul> |