Author: tmortagne
Date: 2007-12-13 15:29:52 +0100 (Thu, 13 Dec 2007)
New Revision: 6366
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
xwiki-platform/xwiki-plugins/trunk/wiki-manager/pom.xml
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
Log:
XAWM-29: Add users or groups at wiki creation time
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/DeleteWikiCode
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1190984758000</creationDate>
<date>1196265465000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191861931000</creationDate>
<date>1192548685000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191514175000</creationDate>
<date>1196265534000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191858101000</creationDate>
<date>1195041935000</date>
-<contentUpdateDate>1196356923000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191500546000</creationDate>
<date>1196265585000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191862105000</creationDate>
<date>1192967360000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/SetWikiVisibilityCode
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1190985121000</creationDate>
<date>1196265388000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191861990000</creationDate>
<date>1192549257000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191862009000</creationDate>
<date>1192549207000</date>
-<contentUpdateDate>1196356923000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1191861970000</creationDate>
<date>1192548761000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/CreateNewWiki
2007-12-13 14:29:52 UTC (rev 6366)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186676964000</creationDate>
-<date>1196761105000</date>
-<contentUpdateDate>1196761105000</contentUpdateDate>
-<version>2.1</version>
+<date>1197555790000</date>
+<contentUpdateDate>1197555790000</contentUpdateDate>
+<version>96.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -54,7 +54,65 @@
<tags/>
</property>
</object>
-<content>#set($wikimanager = $xwiki.wikimanager)
+<content>############################################################################################
+#macro(getRequestList $paramlist $paramname)
+ #set($paramtable = [])
+ #set($paramtable = $request.getParameterValues($paramname))
+ #if($paramtable)
+ #set($paramlist = [])
+ #foreach($paramvalue in $paramtable)
+ #set($ok = $paramlist.add($paramvalue))
+ #end
+ #end
+#end
+##
+#macro(printUsersAndGroups $users $groups $rightlevel $userlist $grouplist)
+ <select name="${rightlevel}users" id="${rightlevel}users"
multiple="multiple">
+ #foreach ($user in $users)
+ #if($context.database == $context.mainWikiName) #set($user =
"${context.mainWikiName}:${user}") #end
+ <option value="$user" #if($userlist &&
$userlist.contains($user)) selected="selected"
#end>$xwiki.getUserName($user, $xwiki.null, false)</option>
+ #end
+ </select>
+ <select name="${rightlevel}groups" id="${rightlevel}groups"
multiple="multiple">
+ #foreach ($group in $groups)
+ #if($context.database == $context.mainWikiName) #set($group =
"${context.mainWikiName}:${group}") #end
+ #set($pointindex = $group.indexOf(".") + 1)
+ <option value="$group" #if($grouplist &&
$grouplist.contains($group)) selected="selected"
#end>$group.substring($pointindex)</option>
+ #end
+ </select>
+#end
+##
+#macro(addRights $prefdoc $userlist $grouplist $rights $needsave)
+ #set($users = "")
+ #foreach($user in $userlist)
+ #if($users != "")
+ #set($users = "${users},${user}")
+ #else
+ #set($users = $user)
+ #end
+ #end
+ #set($groups = "")
+ #foreach($group in $grouplist)
+ #if($groups != "")
+ #set($groups = "${groups},${group}")
+ #else
+ #set($groups = $group)
+ #end
+ #end
+ ##
+ #if(($users != "") || ($groups != ""))
+ #set ($rightsobj = $prefdoc.newObject("XWiki.XWikiGlobalRights"))
+ ##
+ #set ($ok = $rightsobj.set("users", $users))
+ #set ($ok = $rightsobj.set("groups", $groups))
+ #set ($ok = $rightsobj.set("levels", $rights))
+ #set ($ok = $rightsobj.set("allow", 1))
+ ##
+ #set($needsave = true)
+ #end
+#end
+############################################################################################
+#set($wikimanager = $xwiki.wikimanager)
#set($Exception = $wikimanager.DefaultException)
##
#set($domainname = "localdomain.com")
@@ -74,14 +132,39 @@
$wikidocument.set("server", "${wikiname}.${domainname}")
#end
##
+#getRequestList($readeruserlist "readersusers")
+#getRequestList($readergrouplist "readersgroups")
+#getRequestList($writeruserlist "writersusers")
+#getRequestList($writergrouplist "writersgroups")
+#getRequestList($adminuserlist "adminsusers")
+#getRequestList($admingrouplist "adminsgroups")
+##
#############################################################################
##
1 $msg.get("wikimanager.createwiki")
##
#if ($action && $action == "create")
#set($result = $wikimanager.createNewWiki($wikiname, $wikitemplate,
$wikipackage, $wikidocument, true))
-##
+ ##
#if ($result == $Exception.ERROR_NOERROR)
+ ## Init new wiki global rights
+ #set($currentwiki = $context.database)
+ #set($ok = $context.setDatabase($wikidocument.wikiName))
+ ##
+ #set($prefdoc = $xwiki.getDocument("XWiki.XWikiPreferences"))
+ ##
+ #set($needsave = false)
+ ##
+ #addRights($prefdoc $readeruserlist $readergrouplist "view, comment"
$needsave)
+ #addRights($prefdoc $writeruserlist $writergrouplist "edit, view, comment"
$needsave)
+ #addRights($prefdoc $adminuserlist $admingrouplist "admin" $needsave)
+ ##
+ #if($needsave)
+ $prefdoc.save()
+ #end
+ ##
+ #set($ok = $context.setDatabase($currentwiki))
+ ##
#info($msg.get("wikimanager.successcreatewiki", [$wikiname,
$wikidocument.getHomePageUrl()]))
#else
#if ($result == $Exception.ERROR_WM_WIKIALREADYEXISTS)
@@ -96,58 +179,82 @@
<fieldset>
<legend>$msg.get("wikimanager.legend.wiki")</legend>
<input type="hidden" name="action" value="create" />
- <table width="100%">
- <tr>
- <td>$msg.get("wikimanager.wikiname")</td>
- <td><input size="30" id="wikiname" name="wikiname"
type="text" /></td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikidesc")</td>
- <td>$wikidocument.display("description", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikidomain")</td>
- <td>$wikidocument.display("server", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikiadmin")</td>
- <td>$wikidocument.display("owner", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikivisibility")</td>
- <td>$wikidocument.display("visibility", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikistate")</td>
- <td>$wikidocument.display("state", "edit")</td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikitemplate")</td>
- <td>
- <select name="wikitemplate" id="wikitemplate">
- <option value=""></option>
- #set($listtemplate=$wikimanager.getWikiTemplateList())
- #foreach ($template in $listtemplate)
- <option
value="$template.wikiName">$template.wikiName</option>
- #end
- </select>
- </td>
- </tr>
- <tr>
- <td>$msg.get("wikimanager.wikipackage")</td>
- <td>
- <select name="wikipackage" id="wikipackage">
- <option value=""></option>
- #set($listpackage=$doc.getAttachmentList())
- #foreach ($package in $listpackage)
- <option
value="$package.getFilename()">$package.getFilename()</option>
- #end
- </select>
- </td>
- </tr>
- </table>
+ ##
+ <dl>
+ <dt>$msg.get("wikimanager.wikiname")</dt>
+ <dd><input size="30" id="wikiname" name="wikiname" type="text"
/></dd>
+ </dl>
+ <dl>
+ <dt>$msg.get("wikimanager.wikidesc")</dt>
+ <dd>$wikidocument.display("description", "edit")</dd>
+ </dl>
+ <dl>
+ <dt>$msg.get("wikimanager.wikidomain")</dt>
+ <dd>$wikidocument.display("server", "edit")</dd>
+ </dl>
+ <dl>
+ <dt>$msg.get("wikimanager.wikiadmin")</dt>
+ <dd>$wikidocument.display("owner", "edit")</dd>
+ </dl>
+ <dl>
+ <dt>$msg.get("wikimanager.wikivisibility")</dt>
+ <dd>$wikidocument.display("visibility", "edit")</dd>
+ </dl>
+ <dl>
+ <dt>$msg.get("wikimanager.wikistate")</dt>
+ <dd>$wikidocument.display("state", "edit")</dd>
+ </dl>
</fieldset>
+ #############################################################################
<fieldset>
+ <legend>$msg.get("wikimanager.legend.sources")</legend>
+ ##
+ <dl>
+ <dt><label
for="wikitemplate">$msg.get("wikimanager.wikitemplate")</label></dt>
+ <dd>
+ <select name="wikitemplate" id="wikitemplate">
+ <option value="">---</option>
+ #set($listtemplate=$wikimanager.getWikiTemplateList())
+ #foreach ($template in $listtemplate)
+ <option
value="$template.wikiName">$template.wikiName</option>
+ #end
+ </select>
+ </dd>
+ </dl>
+ <dl>
+ <dt><label
for="wikipackage">$msg.get("wikimanager.wikipackage")</label></dt>
+ <dd>
+ <select name="wikipackage" id="wikipackage">
+ <option value="">---</option>
+ #set($listpackage=$doc.getAttachmentList())
+ #foreach ($package in $listpackage)
+ <option
value="$package.getFilename()">$package.getFilename()</option>
+ #end
+ </select>
+ </dd>
+ </dl>
+ </fieldset>
+ #############################################################################
+ #set($rightsmanager = $xwiki.rightsmanager)
+ #set($users = $rightsmanager.usersApi.allGlobalUsersNames)
+ #set($groups = $rightsmanager.groupsApi.allGlobalGroupsNames)
+ <fieldset>
+ <legend>$msg.get("wikimanager.legend.members")</legend>
+ ##
+ <dl>
+ <dt><label
for="readersusers">$msg.get("wikimanager.readers")</label></dt>
+ <dd>#printUsersAndGroups($users $groups "readers" $readeruserlist
$readergrouplist)</dd>
+ </dl>
+ <dl>
+ <dt><label
for="writersusers">$msg.get("wikimanager.writers")</label></dt>
+ <dd>#printUsersAndGroups($users $groups "writers" $writeruserlist
$writergrouplist)</dd>
+ </dl>
+ <dl>
+ <dt><label
for="adminsusers">$msg.get("wikimanager.admins")</label></dt>
+ <dd>#printUsersAndGroups($users $groups "admins" $adminuserlist
$admingrouplist)</dd>
+ </dl>
+ </fieldset>
+ <fieldset>
<legend>$msg.get("wikimanager.legend.validate")</legend>
<input type="submit" value="create" />
</fieldset>
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiManager/WebHome
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,8 +13,8 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186676868000</creationDate>
<date>1196357162000</date>
-<contentUpdateDate>1196357162000</contentUpdateDate>
-<version>4.1</version>
+<contentUpdateDate>1197464015000</contentUpdateDate>
+<version>1.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -54,94 +54,94 @@
<tags/>
</property>
</object>
-<content>#set($WikiManager = $xwiki.wikimanager)
-#set($Exception = $WikiManager.DefaultException)
-
-#set($action = $request.getParameter("action"))
-#set($confirm = $request.getParameter("confirm"))
-
-#set($wikiname = $request.getParameter("wikiname"))
-#set($serverid = $xwiki.parseInt($request.getParameter("serverid")))
-#set($wikivisibility = $request.getParameter("wikivisibility"))
-
-#############################################################################
-
-#if($action)
- #if($action == "delete")
- #includeInContext("WikiCode.DeleteWikiCode")
- #elseif($action == "setvisibility")
- #includeInContext("WikiCode.SetWikiVisibilityCode")
- #end
-#end
-
-#############################################################################
-
-1 Wikis
-
-#############################################################################
-
-#set($wikiList = $WikiManager.getAllWikis())
-<div style="font-weight:bold;">
- $msg.get("wikimanager.totalnumberofwiki") : $wikiList.size()<br />
- #if($hasadmin)
- [$msg.get("wikimanager.createwiki")>WikiManager.CreateNewWiki]<br
/>
- #end
-</div>
-
-#if($wikiList.size()!=0)
- <table id="wikiTable" class="grid sortable filterable doOddEven">
- <tr class="sortHeader">
- <th>$msg.get("wikimanager.listwikiname")</th>
- <th>$msg.get("wikimanager.listwikiadmin")</th>
- <th>$msg.get("wikimanager.listwikicreation")</th>
- <th>$msg.get("wikimanager.listwikistate")</th>
- <th>$msg.get("wikimanager.listwikivisibility")</th>
- <th class="unsortable noFilter">$msg.get("more")</th>
- </tr>
- #foreach($wiki in $wikiList)
- #set($wikiAliasList = $wiki.wikiAliasList)
- <tr>
- <td>$wiki.wikiName #if($wikiAliasList.size() == 1)
($!wikiAliasList.get(0).wikiPrettyName
[$wikiAliasList.get(0).server>$wikiAliasList.get(0).homePageUrl])
#end</td>
- <td>#if($wikiAliasList.size()==1) [$wikiAliasList.get(0).owner]
#end</td>
- <td>$xwiki.formatDate($wiki.creationDate,"dd/MM/yyyy")</td>
- <td>#if($wikiAliasList.size()==1) $wikiAliasList.get(0).state
#end</td>
- <td>#if($wikiAliasList.size()==1)
$wikiAliasList.get(0).visibility #end</td>
- <td>
- #if($wikiAliasList.size()==1)
- #if($wikiAliasList.get(0).visibility == "public")
-
[$msg.get("wikimanager.action.setvisibility.private")>?action=setvisibility&amp;wikiname=$wikiAliasList.get(0).WikiName&amp;serverid=$wikiAliasList.get(0).objectId&amp;wikivisibility=private]
|
- #elseif($wikiAliasList.get(0).visibility == "private")
-
[$msg.get("wikimanager.action.setvisibility.template")>?action=setvisibility&amp;wikiname=$wikiAliasList.get(0).WikiName&amp;serverid=$wikiAliasList.get(0).objectId&amp;wikivisibility=template]
|
- #elseif($wikiAliasList.get(0).visibility == "template")
-
[$msg.get("wikimanager.action.setvisibility.public")>?action=setvisibility&amp;wikiname=$wikiAliasList.get(0).WikiName&amp;serverid=$wikiAliasList.get(0).objectId&amp;wikivisibility=public]
|
- #end
- #end
-
[$msg.get("delete")>?action=delete&amp;wikiname=$wiki.WikiName] | <a
href="$wiki.getURL("inline")">$msg.get("edit")</a></td>
- </tr>
- #if($wikiAliasList.size() > 1)
- #foreach($wikiAlias in $wikiAliasList)
- <tr>
- <td>- $!wikiAliasList.get(0).wikiPrettyName
[$wikiAlias.server>$wikiAlias.homePageUrl]</td>
- <td>[$wikiAlias.owner]</td>
- <td></td>
- <td>$wikiAlias.state</td>
- <td>$wikiAlias.visibility</td>
- <td>
- #if($wikiAlias.visibility == "public")
- <a href="$doc.getURL("view",
"action=setvisibility&amp;wikiname=$wikiAlias.WikiName&amp;serverid=$wikiAlias.objectId&amp;wikivisibility=private")">$msg.get("wikimanager.action.setvisibility.private")</a>
|
- #elseif($wikiAlias.visibility == "private")
- <a href="$doc.getURL("view",
"action=setvisibility&amp;wikiname=$wikiAlias.WikiName&amp;serverid=$wikiAlias.objectId&amp;wikivisibility=template")">$msg.get("wikimanager.action.setvisibility.template")</a>
|
- #elseif($wikiAlias.visibility == "template")
- <a href="$doc.getURL("view",
"action=setvisibility&amp;wikiname=$wikiAlias.WikiName&amp;serverid=$wikiAlias.objectId&amp;wikivisibility=public")">$msg.get("wikimanager.action.setvisibility.public")</a>
|
- #end
- <a href="$doc.getURL("view",
"action=delete&amp;wikiname=$wikiAlias.WikiName&amp;serverid=$wikiAlias.objectId")">$msg.get("delete")</a>
- </td>
- </tr>
- #end
- #end
- #end
- </table>
-#else
- $msg.get("wikimanager.listwikiempty")
-#end
+<content>#set($WikiManager = $xwiki.wikimanager)
+#set($Exception = $WikiManager.DefaultException)
+
+#set($action = $request.getParameter("action"))
+#set($confirm = $request.getParameter("confirm"))
+
+#set($wikiname = $request.getParameter("wikiname"))
+#set($serverid = $xwiki.parseInt($request.getParameter("serverid")))
+#set($wikivisibility = $request.getParameter("wikivisibility"))
+
+#############################################################################
+
+#if($action)
+ #if($action == "delete")
+ #includeInContext("WikiCode.DeleteWikiCode")
+ #elseif($action == "setvisibility")
+ #includeInContext("WikiCode.SetWikiVisibilityCode")
+ #end
+#end
+
+#############################################################################
+
+1 Wikis
+
+#############################################################################
+
+#set($wikiList = $WikiManager.getAllWikis())
+<div style="font-weight:bold;">
+ $msg.get("wikimanager.totalnumberofwiki") : $wikiList.size()<br />
+ #if($hasadmin)
+ [$msg.get("wikimanager.createwiki")>WikiManager.CreateNewWiki]<br
/>
+ #end
+</div>
+
+#if($wikiList.size()!=0)
+ <table id="wikiTable" class="grid sortable filterable doOddEven">
+ <tr class="sortHeader">
+ <th>$msg.get("wikimanager.listwikiname")</th>
+ <th>$msg.get("wikimanager.listwikiadmin")</th>
+ <th>$msg.get("wikimanager.listwikicreation")</th>
+ <th>$msg.get("wikimanager.listwikistate")</th>
+ <th>$msg.get("wikimanager.listwikivisibility")</th>
+ <th class="unsortable noFilter">$msg.get("more")</th>
+ </tr>
+ #foreach($wiki in $wikiList)
+ #set($wikiAliasList = $wiki.wikiAliasList)
+ <tr>
+ <td>$wiki.wikiName #if($wikiAliasList.size() == 1)
($!wikiAliasList.get(0).wikiPrettyName
[$wikiAliasList.get(0).server>$wikiAliasList.get(0).homePageUrl])
#end</td>
+ <td>#if($wikiAliasList.size()==1) [$wikiAliasList.get(0).owner]
#end</td>
+ <td>$xwiki.formatDate($wiki.creationDate,"dd/MM/yyyy")</td>
+ <td>#if($wikiAliasList.size()==1) $wikiAliasList.get(0).state
#end</td>
+ <td>#if($wikiAliasList.size()==1)
$wikiAliasList.get(0).visibility #end</td>
+ <td>
+ #if($wikiAliasList.size()==1)
+ #if($wikiAliasList.get(0).visibility == "public")
+
[$msg.get("wikimanager.action.setvisibility.private")>?action=setvisibility&amp;wikiname=$wikiAliasList.get(0).WikiName&amp;serverid=$wikiAliasList.get(0).objectId&amp;wikivisibility=private]
|
+ #elseif($wikiAliasList.get(0).visibility == "private")
+
[$msg.get("wikimanager.action.setvisibility.template")>?action=setvisibility&amp;wikiname=$wikiAliasList.get(0).WikiName&amp;serverid=$wikiAliasList.get(0).objectId&amp;wikivisibility=template]
|
+ #elseif($wikiAliasList.get(0).visibility == "template")
+
[$msg.get("wikimanager.action.setvisibility.public")>?action=setvisibility&amp;wikiname=$wikiAliasList.get(0).WikiName&amp;serverid=$wikiAliasList.get(0).objectId&amp;wikivisibility=public]
|
+ #end
+ #end
+
[$msg.get("delete")>?action=delete&amp;wikiname=$wiki.WikiName] | <a
href="$wiki.getURL("inline")">$msg.get("edit")</a></td>
+ </tr>
+ #if($wikiAliasList.size() > 1)
+ #foreach($wikiAlias in $wikiAliasList)
+ <tr>
+ <td>- $!wikiAliasList.get(0).wikiPrettyName
[$wikiAlias.server>$wikiAlias.homePageUrl]</td>
+ <td>[$wikiAlias.owner]</td>
+ <td></td>
+ <td>$wikiAlias.state</td>
+ <td>$wikiAlias.visibility</td>
+ <td>
+ #if($wikiAlias.visibility == "public")
+ <a href="$doc.getURL("view",
"action=setvisibility&amp;wikiname=$wikiAlias.WikiName&amp;serverid=$wikiAlias.objectId&amp;wikivisibility=private")">$msg.get("wikimanager.action.setvisibility.private")</a>
|
+ #elseif($wikiAlias.visibility == "private")
+ <a href="$doc.getURL("view",
"action=setvisibility&amp;wikiname=$wikiAlias.WikiName&amp;serverid=$wikiAlias.objectId&amp;wikivisibility=template")">$msg.get("wikimanager.action.setvisibility.template")</a>
|
+ #elseif($wikiAlias.visibility == "template")
+ <a href="$doc.getURL("view",
"action=setvisibility&amp;wikiname=$wikiAlias.WikiName&amp;serverid=$wikiAlias.objectId&amp;wikivisibility=public")">$msg.get("wikimanager.action.setvisibility.public")</a>
|
+ #end
+ <a href="$doc.getURL("view",
"action=delete&amp;wikiname=$wikiAlias.WikiName&amp;serverid=$wikiAlias.objectId")">$msg.get("delete")</a>
+ </td>
+ </tr>
+ #end
+ #end
+ #end
+ </table>
+#else
+ $msg.get("wikimanager.listwikiempty")
+#end
</content></xwikidoc>
\ No newline at end of file
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiResources/Translations
2007-12-13 14:29:52 UTC (rev 6366)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1186679007000</creationDate>
-<date>1196761095000</date>
-<contentUpdateDate>1196761095000</contentUpdateDate>
-<version>2.1</version>
+<date>1197474749000</date>
+<contentUpdateDate>1197474749000</contentUpdateDate>
+<version>4.1</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -86,6 +86,11 @@
wikimanager.listwikivisibility=Visibility
wikimanager.legend.wiki=Wiki
wikimanager.legend.validate=Validate
+wikimanager.legend.members=Members
+wikimanager.legend.sources=Create new wiki from
+wikimanager.readers=Readers
+wikimanager.writers=Writers
+wikimanager.admins=Administrators
##
# WIDGETS
##
Modified:
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
===================================================================
---
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/XApp/XWikiApplicationWikiManager
2007-12-13 14:29:52 UTC (rev 6366)
@@ -13,7 +13,7 @@
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1188217603000</creationDate>
<date>1191517448000</date>
-<contentUpdateDate>1196356924000</contentUpdateDate>
+<contentUpdateDate>1197464014000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
@@ -31,6 +31,14 @@
<defaultWeb></defaultWeb>
<nameField></nameField>
<validationScript></validationScript>
+<appauthors>
+<name>appauthors</name>
+<number>10</number>
+<prettyName>Authors</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</appauthors>
<applications>
<cache>0</cache>
<customDisplay></customDisplay>
@@ -175,6 +183,14 @@
<values></values>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</documents>
+<license>
+<name>license</name>
+<number>11</number>
+<prettyName>License</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</license>
<translationdocs>
<cache>0</cache>
<customDisplay></customDisplay>
Modified: xwiki-platform/xwiki-plugins/trunk/wiki-manager/pom.xml
===================================================================
--- xwiki-platform/xwiki-plugins/trunk/wiki-manager/pom.xml 2007-12-13
13:45:56 UTC (rev 6365)
+++ xwiki-platform/xwiki-plugins/trunk/wiki-manager/pom.xml 2007-12-13
14:29:52 UTC (rev 6366)
@@ -42,9 +42,6 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-core</artifactId>
- <!-- Currently this Wiki Manager plugin is used by XEM which is based on
XWiki Core
- version 1.1.x, hence this dependency on 1.1.X and not on 1.2.x. If
this becomes a
- problem we can branch this plugin. -->
<version>${platform.core.version}</version>
</dependency>
<dependency>
Modified:
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
===================================================================
---
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
2007-12-13 13:45:56 UTC (rev 6365)
+++
xwiki-platform/xwiki-plugins/trunk/wiki-manager/src/main/java/com/xpn/xwiki/plugin/wikimanager/WikiManager.java
2007-12-13 14:29:52 UTC (rev 6366)
@@ -739,7 +739,7 @@
// Init database/schema
try {
- xwiki.updateDatabase(targetWiki, true, false, context);
+ xwiki.updateDatabase(targetWiki, true, context);
} catch (Exception e) {
throw new
WikiManagerException(WikiManagerException.ERROR_WM_UPDATEDATABASE, msg.get(
WikiManagerMessageTool.ERROR_UPDATEDATABASE, targetWiki), e);
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
