From: <man...@us...> - 2009-07-24 11:15:35
|
Revision: 20329 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20329&view=rev Author: mangapower Date: 2009-07-24 11:15:22 +0000 (Fri, 24 Jul 2009) Log Message: ----------- [MOD] Modified tiki-user_ws.php: now it show all objects but only viewable objects for user have link Modified Paths: -------------- branches/experimental/ws/lib/workspaces/wslib.php branches/experimental/ws/lib/workspaces/wstools/scriptCreator.php branches/experimental/ws/templates/tiki-user_ws.tpl branches/experimental/ws/tiki-user_ws.php Modified: branches/experimental/ws/lib/workspaces/wslib.php =================================================================== --- branches/experimental/ws/lib/workspaces/wslib.php 2009-07-24 10:35:00 UTC (rev 20328) +++ branches/experimental/ws/lib/workspaces/wslib.php 2009-07-24 11:15:22 UTC (rev 20329) @@ -893,12 +893,12 @@ * @param $user The username * @return Associative array with the objects that a user have access from a WS */ - public function list_ws_objects_for_user ($ws_id, $user) + public function list_ws_objects_for_user ($ws_id, $user, $maxRecord = -1, $offset = -1) { require_once('lib/userslib.php'); global $userlib; global $objectlib; - $listWSObjects = $this->list_ws_objects($ws_id); + $listWSObjects = $this->list_ws_objects($ws_id, $maxRecord, $offset); foreach ($listWSObjects as $object) { @@ -908,7 +908,11 @@ $objectPermsUser = $this->get_object_perms_for_user ($objId, $objectType, $user); if (in_array($viewPerm,$objectPermsUser)) - $listWSObjectsUser[] = $object; + $object["userCanView"] = "y"; + else + $object["userCanView"] = "n"; + + $listWSObjectsUser[] = $object; } return $listWSObjectsUser; Modified: branches/experimental/ws/lib/workspaces/wstools/scriptCreator.php =================================================================== --- branches/experimental/ws/lib/workspaces/wstools/scriptCreator.php 2009-07-24 10:35:00 UTC (rev 20328) +++ branches/experimental/ws/lib/workspaces/wstools/scriptCreator.php 2009-07-24 11:15:22 UTC (rev 20329) @@ -224,12 +224,15 @@ $listWSObjectsUser = $wslib->list_ws_objects_for_user ($id3,$user); foreach ($listWSObjectsUser as $key) { - echo ($key["objectId"]); - echo (" "); - echo ($key["type"]); - echo (" "); - echo ($key["name"]); - echo ("\n<br>"); + if ($key["userCanView"] == "y") + { + echo ($key["objectId"]); + echo (" "); + echo ($key["type"]); + echo (" "); + echo ($key["name"]); + echo ("<br>"); + } } echo ("\n<br>"); @@ -247,12 +250,15 @@ $listWSObjectsUser = $wslib->list_ws_objects_for_user ($id3,$user); foreach ($listWSObjectsUser as $key) { - echo ($key["objectId"]); - echo (" "); - echo ($key["type"]); - echo (" "); - echo ($key["name"]); - echo ("\n<br>"); + if ($key["userCanView"] == "y") + { + echo ($key["objectId"]); + echo (" "); + echo ($key["type"]); + echo (" "); + echo ($key["name"]); + echo ("<br>"); + } } echo ("\n<br>"); @@ -268,12 +274,16 @@ $listWSObjectsUser = $wslib->list_ws_objects_for_user ($id3,$user); foreach ($listWSObjectsUser as $key) { - echo ($key["objectId"]); - echo (" "); - echo ($key["type"]); - echo (" "); - echo ($key["name"]); - echo ("\n<br>"); + if ($key["userCanView"] == "y") + { + echo ($key["objectId"]); + echo (" "); + echo ($key["type"]); + echo (" "); + echo ($key["name"]); + echo (" +<br>"); + } } echo ("\n<br>"); @@ -342,12 +352,15 @@ $listWSObjectsUser = $wslib->list_ws_objects_for_user ($id4,$user); foreach ($listWSObjectsUser as $key) { - echo ($key["objectId"]); - echo (" "); - echo ($key["type"]); - echo (" "); - echo ($key["name"]); - echo ("\n<br>"); + if ($key["userCanView"] == "y") + { + echo ($key["objectId"]); + echo (" "); + echo ($key["type"]); + echo (" "); + echo ($key["name"]); + echo ("\n<br>"); + } } echo ("\n<br>"); Modified: branches/experimental/ws/templates/tiki-user_ws.tpl =================================================================== --- branches/experimental/ws/templates/tiki-user_ws.tpl 2009-07-24 10:35:00 UTC (rev 20328) +++ branches/experimental/ws/templates/tiki-user_ws.tpl 2009-07-24 11:15:22 UTC (rev 20329) @@ -8,7 +8,13 @@ </tr> {foreach from=$resources item=data} <tr> - <td><a href = {$data.href}>{$data.name}</a></td> + <td> + {if $data.userCanView eq "y"} + <a href = {$data.href}>{$data.name}</a> + {else} + {$data.name} + {/if} + </td> <td>{$data.type}</td> <td>{$data.description}</td> </tr> Modified: branches/experimental/ws/tiki-user_ws.php =================================================================== --- branches/experimental/ws/tiki-user_ws.php 2009-07-24 10:35:00 UTC (rev 20328) +++ branches/experimental/ws/tiki-user_ws.php 2009-07-24 11:15:22 UTC (rev 20329) @@ -5,10 +5,10 @@ if ( isset($_REQUEST['showWS'])) { - $ws_id = (int) $_REQUEST['showWS']; - $ws_name = $_REQUEST['nameWS']; - - // Set title + $ws_id = $_REQUEST['showWS']; + $ws_name = $_REQUEST['nameWS']; + + // Set title $title = "Objects for ".$user." in '".$ws_name."'"; $smarty->assign('headtitle', tra($title)); $smarty->assign('WS_title', $title); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |