Author: tmortagne
Date: 2007-11-07 14:32:15 +0100 (Wed, 07 Nov 2007)
New Revision: 5694
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupSheet
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupTemplate
Log:
XWIKI-1780: Improve rights management
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupSheet
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupSheet
2007-11-07 13:32:12 UTC (rev 5693)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupSheet
2007-11-07 13:32:15 UTC (rev 5694)
@@ -12,25 +12,48 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1107116063000</creationDate>
-<date>1166177443000</date>
-<contentUpdateDate>1194359925000</contentUpdateDate>
-<version>1.1</version>
+<date>1194439571000</date>
+<contentUpdateDate>1194439571000</contentUpdateDate>
+<version>1.22</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
<comment></comment>
-<content>
-#set($interface = $request.get("interface"))
-#if(!$interface)
- #set($interface = $xwiki.rightsmanager.defaultUi)
-#end
-## switch between the new and the stable interface
-<select name="switchInterface" onchange="if(this.value=='new') {
location='?interface=new'; } else if(this.value=='stable') {
location='?interface=stable'; } ">
- <option value="choose" #if(!$interface) selected="selected"
#end>Switch interface</option>
- <option value="new" #if($interface == "new") selected="selected"
#end>New Interface</option>
- <option value="stable" #if($interface == "stable") selected="selected"
#end>Stable Interface</option>
-</select>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>XWiki.XWikiGroupSheet</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>#set($interface = $xwiki.rightsmanager.defaultUi)
#if($interface == "new") ## new interface
<div id="ajax-loader">Loading...<br />
<img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..."
title="Loading..." />
@@ -54,15 +77,20 @@
</tr>
</table>
#if($context.action == "inline")
+
<div id="addNewMember">
<table cellpadding="5" cellspacing="5">
<tr>
<td><strong>Add a new user </strong></td>
<td>
+ #if($context.database != "xwiki") #set($mainwk = false) #else
#set($mainwk = true) #end
+ #if(!$mainwk) ## display the combobox only in a local wiki
<select name="wiki" onchange="changeWiki(this);">
<option value="local"
selected="selected">Local</option>
<option value="global">Global</option>
</select>
+ #else <input type="hidden" name="wiki" value="local" />
+ #end
</td>
<td>
<input id="userSuggest" type="text" size="30" name="newMember"
autocomplete="off" onfocus="createSuggest(this, 'user');"/>
@@ -74,10 +102,14 @@
<tr>
<td><strong>Add a new group </strong></td>
<td>
+ #if($context.database != "xwiki") #set($mainwk = false) #else
#set($mainwk = true) #end
+ #if(!$mainwk) ## display the combobox only in a local wiki
<select name="wiki" onchange="changeWiki(this);">
- <option value="local" selected="selected">Local</option>
- <option value="global">Global</option>
+ <option value="local"
selected="selected">Local</option>
+ <option value="global">Global</option>
</select>
+ #else <input type="hidden" name="wiki" value="local" />
+ #end
</td>
<td>
<input id="groupSuggest" type="text" size="30" name="newMember"
autocomplete="off" onfocus="createSuggest(this, 'group');"/>
@@ -92,6 +124,8 @@
#end
#set($url = $doc.getURL("view", "xpage=getgroupmembers"))
+#set($du = $msg.get("rightsmanager.duplicateuser"))
+
{pre}
<script type="text/javascript">
window.tabl = new ASSTable("$url", 15, "display1", "scrollbar1",
"memberstable", displayMembers, true);
@@ -127,12 +161,12 @@
$('groupSuggest').value = "";
var nr = parseInt(transport.responseText);
- if(nr == 0) $('errMsg').innerHTML =
"$msg.get("duplicateuser")";
+ if(nr == 0) $('errMsg').innerHTML = "$du";
else {
- var end = window.tabl.totalRows + nr;
- var start = end - window.tabl.limit;
- if(start < 1) start = 1;
- window.tabl.showRows(start, end);
+ var end = window.tabl.totalRows + nr;
+ var start = end - window.tabl.limit + 1;
+ if(start < 1) start = 1;
+ window.tabl.showRows(start,
window.tabl.limit);
}
}
});
@@ -143,7 +177,7 @@
{
if(suggesturl.indexOf("&" + "wiki=") >= 0)
suggesturl = suggesturl.substring(0, suggesturl.indexOf("&" +
"wiki="));
- suggesturl += "&" + "wiki=" +
trim(obj.options[obj.selectedIndex].value);
+ suggesturl += "&" + "wiki=" + trim(obj.value);
// clear errors messages
$('errMsg').innerHTML = "";
}
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupTemplate
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupTemplate
2007-11-07 13:32:12 UTC (rev 5693)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupTemplate
2007-11-07 13:32:15 UTC (rev 5694)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1107115982000</creationDate>
-<date>1177088898000</date>
-<contentUpdateDate>1194359925000</contentUpdateDate>
-<version>1.1</version>
+<date>1194436282000</date>
+<contentUpdateDate>1194436282000</contentUpdateDate>
+<version>1.3</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -53,5 +53,31 @@
<tags/>
</property>
</object>
+<object>
+<class>
+<name>XWiki.XWikiGroups</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<member>
+<name>member</name>
+<number>1</number>
+<prettyName>Member</prettyName>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+</member>
+</class>
+<name>XWiki.XWikiGroupTemplate</name>
+<number>0</number>
+<className>XWiki.XWikiGroups</className>
+<property>
+<member></member>
+</property>
+</object>
<content>#includeForm("XWiki.XWikiGroupSheet")</content>
</xwikidoc>
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
