From: <ax...@us...> - 2009-07-08 17:37:46
|
Revision: 20011 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20011&view=rev Author: axold Date: 2009-07-08 17:37:43 +0000 (Wed, 08 Jul 2009) Log Message: ----------- [MOD] Added a proto interface to add ws, very unstable Modified Paths: -------------- branches/experimental/ws/lib/workspaces/wslib.php branches/experimental/ws/templates/tiki-admin-include-workspaces.tpl branches/experimental/ws/tiki-admin_include_workspaces.php Modified: branches/experimental/ws/lib/workspaces/wslib.php =================================================================== --- branches/experimental/ws/lib/workspaces/wslib.php 2009-07-08 16:25:04 UTC (rev 20010) +++ branches/experimental/ws/lib/workspaces/wslib.php 2009-07-08 17:37:43 UTC (rev 20011) @@ -58,8 +58,10 @@ { global $userlib; require_once 'lib/userslib.php'; + if (!$wsName) + $wsName = $this->get_ws_name($idWS, $this->ws_container); + $groupName = ((string) $idWS)."::".$wsName."::".$nameGroup; //With this you can create two groups with same name in different ws - var_dump($groupName); if ($userlib->add_group($groupName)) { @@ -76,7 +78,7 @@ return false; } - // Remove a WS + // Remove a WS -For now, not very useful, we need to create it again!- public function remove_ws ($ws_id) { $newParent = parent::get_category_description($ws_id); @@ -117,10 +119,10 @@ } //Get a WS name by its id - public function get_ws_name($id, $parentWS) + public function get_ws_name($wsid, $parentWS) { $query = "select `categId` from `tiki_categories` where `categId`=? and `parentId`=?"; - $bindvars = array($id, $parentWS, $this->ws_container); + $bindvars = array($wsid, $parentWS, $this->ws_container); return $this->getOne($query, $bindvars); } Modified: branches/experimental/ws/templates/tiki-admin-include-workspaces.tpl =================================================================== --- branches/experimental/ws/templates/tiki-admin-include-workspaces.tpl 2009-07-08 16:25:04 UTC (rev 20010) +++ branches/experimental/ws/templates/tiki-admin-include-workspaces.tpl 2009-07-08 17:37:43 UTC (rev 20011) @@ -29,10 +29,34 @@ <ul> <li>Status: {if $prefs.feature_workspaces eq 'y'} <strong>Workspaces are enabled</strong> {else}<strong>Workspaces are disabled</strong>{/if}</li> <li>Workspaces Container Id: {$prefs.ws_container}</li> -<li>Workspaces Container Name: {$prefs.ws_container_name}</li> </ul> </div> </fieldset> + +<fieldset><legend>Create a WS</legend> +<div class="adminoptionbox"> + +<label for="wsname">Workspace Name: </label><input type="text" name="wsname" /> + +<br /><br /> + +<input type="radio" name="groupelection" id="selectgroup" checked="checked" /><label for="selectgroup">Select an group to add to the workspace:</label> +<select name="selgroup"> +{foreach from=$groups.data key=k item=v } +<option value="{$groups.data.$k.id}">{$groups.data.$k.groupName}</option> +{/foreach} +</select> +<br /><br /> +<input type="radio" name="groupelection" id="creategroup" /><label for="creategroup">Create a new group to add to the workspace:</label><input type="text" name="groupname" /> +<br /><br /> +<input type="checkbox" name="resourceforws" id="resource" checked="checked" disabled="disabled" /><label for="resource">Create a wiki page inside this workspace</label> + +</div> +<div class="adminoptionbox"> + <div class="adminoptionlabel"><div align="center"><input type="submit" name="wscreate" value="{tr}Create{/tr}"/></div></div> +</div> +</fieldset> + <fieldset><legend>{tr}Inspector{/tr}</legend> <div class="adminoptionbox"> {if $catree} Modified: branches/experimental/ws/tiki-admin_include_workspaces.php =================================================================== --- branches/experimental/ws/tiki-admin_include_workspaces.php 2009-07-08 16:25:04 UTC (rev 20010) +++ branches/experimental/ws/tiki-admin_include_workspaces.php 2009-07-08 17:37:43 UTC (rev 20011) @@ -5,11 +5,16 @@ require_once ('tiki-setup.php'); $access->check_script($_SERVER["SCRIPT_NAME"],basename(__FILE__)); require_once ('lib/workspaces/wsController.php'); +require_once 'lib/workspaces/wslib.php'; $ws_gui = new ws_gui_controller(); $ws_gui->check_if_new_to_ws(); +global $userlib; require_once 'lib/userslib.php'; +//var_dump($groups = $userlib->get_groups()); +$smarty->assign('groups', $userlib->get_groups()); + if ( isset($_REQUEST['wsoptions']) ) { if ( (isset($_REQUEST['wsdevtools'])) && ($_REQUEST['wsdevtools'] == 'create') ) @@ -19,6 +24,11 @@ else header("Location: ./lib/workspaces/wstools/scriptCreator.php?action=destroy&redirect=yes"); } +else if ( isset($_REQUEST['wscreate']) ) +{ + //var_dump($groupName = $_REQUEST['groupname']); + $wslib->add_ws($_REQUEST['wsname'],1, $_REQUEST['groupname']); +} //$ws_gui->list_ws_resources(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |