Author: tmortagne
Date: 2007-11-02 18:23:17 +0100 (Fri, 02 Nov 2007)
New Revision: 5617
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/database/
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/database/pom.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution-test/pom.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/pom.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/pom.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/pom.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/pom.xml
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupSheet
Log:
XWIKI-1780: Improve rights management
Property changes on:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/database
___________________________________________________________________
Name: svn:ignore
- target
xwiki.log
*.iml
+ target
xwiki.log
*.iml
.classpath
.project
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/database/pom.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/database/pom.xml
2007-11-02 17:23:10 UTC (rev 5616)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/database/pom.xml
2007-11-02 17:23:17 UTC (rev 5617)
@@ -34,7 +34,7 @@
</executions>
<configuration>
<resourceBundles>
-
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.6</resourceBundle>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
</resourceBundles>
</configuration>
</plugin>
@@ -42,7 +42,7 @@
<plugin>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-build-xar-plugin</artifactId>
- <version>1.6</version>
+ <version>${platform.tools.version}</version>
<configuration>
<groupId>com.xpn.xwiki.products</groupId>
<artifactId>xwiki-enterprise-wiki</artifactId>
@@ -61,7 +61,7 @@
<plugin>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-packager</artifactId>
- <version>1.6</version>
+ <version>${platform.tools.version}</version>
<configuration>
<sourceDirectory>${project.build.directory}/xar</sourceDirectory>
<hibernateConfig>
Property changes on:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution
___________________________________________________________________
Name: svn:ignore
- target
*.iml
+ target
*.iml
.classpath
.project
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/pom.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/pom.xml
2007-11-02 17:23:10 UTC (rev 5616)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution/pom.xml
2007-11-02 17:23:17 UTC (rev 5617)
@@ -19,7 +19,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-jetty-resources</artifactId>
- <version>1.6</version>
+ <version>${platform.tools.version}</version>
</dependency>
<!-- Add the database JAR so that it's included in the expanded WAR since
it's not included
by default in the Platform WAR. -->
@@ -46,7 +46,7 @@
</executions>
<configuration>
<resourceBundles>
-
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.6</resourceBundle>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
</resourceBundles>
</configuration>
</plugin>
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution-test/pom.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution-test/pom.xml
2007-11-02 17:23:10 UTC (rev 5616)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/distribution-test/pom.xml
2007-11-02 17:23:17 UTC (rev 5617)
@@ -13,7 +13,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-shared-test</artifactId>
- <version>1.6</version>
+ <version>${platform.tools.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/pom.xml
===================================================================
---
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/pom.xml
2007-11-02 17:23:10 UTC (rev 5616)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/installers/generic/pom.xml
2007-11-02 17:23:17 UTC (rev 5617)
@@ -41,7 +41,7 @@
</executions>
<configuration>
<resourceBundles>
-
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:1.6</resourceBundle>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
</resourceBundles>
</configuration>
</plugin>
@@ -60,13 +60,13 @@
<artifactItem>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-jetty-resources</artifactId>
- <version>1.6</version>
+ <version>${platform.tools.version}</version>
<outputDirectory>${project.build.directory}/container</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-web-standard</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${platform.web.version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/container/webapps/xwiki</outputDirectory>
</artifactItem>
Modified: xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/pom.xml
2007-11-02 17:23:10 UTC (rev 5616)
+++ xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/pom.xml
2007-11-02 17:23:17 UTC (rev 5617)
@@ -27,7 +27,7 @@
<parent>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki</artifactId>
- <version>5</version>
+ <version>6-SNAPSHOT</version>
</parent>
<groupId>com.xpn.xwiki.products</groupId>
<artifactId>xwiki-enterprise-parent</artifactId>
@@ -59,19 +59,26 @@
</modules>
</profile>
</profiles>
+ <properties>
+ <!-- Versions of XWiki dependencies used in XEM modules -->
+ <platform.tools.version>1.7-SNAPSHOT</platform.tools.version>
+ <platform.core.version>1.1-SNAPSHOT</platform.core.version>
+ <platform.web.version>1.1-SNAPSHOT</platform.web.version>
+ <platform.panels.version>1.1-SNAPSHOT</platform.panels.version>
+ </properties>
<build>
<extensions>
<extension>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-build-xar-handlers</artifactId>
- <version>1.6</version>
+ <version>${platform.tools.version}</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-build-xar-plugin</artifactId>
- <version>1.6</version>
+ <version>${platform.tools.version}</version>
</plugin>
</plugins>
</build>
Property changes on:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki
___________________________________________________________________
Name: svn:ignore
- target
*.iml
.project
*.log
+ target
*.iml
.project
*.log
.classpath
Modified:
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/pom.xml
2007-11-02 17:23:10 UTC (rev 5616)
+++ xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/pom.xml
2007-11-02 17:23:17 UTC (rev 5617)
@@ -13,7 +13,7 @@
<dependency>
<groupId>com.xpn.xwiki.platform.applications</groupId>
<artifactId>xwiki-application-panels</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${platform.panels.version}</version>
<type>xar</type>
</dependency>
</dependencies>
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-02 17:23:10 UTC (rev 5616)
+++
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/XWiki/XWikiGroupSheet
2007-11-02 17:23:17 UTC (rev 5617)
@@ -19,8 +19,139 @@
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
-<content>1 $doc.name
+<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>
+#if($interface == "new") ## new interface
+<div id="ajax-loader">Loading...<br />
+ <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..."
title="Loading..." />
+</div>
+<table id="memberstable">
+<tr><td colspan="2" id="showLimits"></td></tr>
+<tr><td>
+ <table class="display">
+ <thead class="theader">
+ <tr>
+ <td class="membername">Member</td>
+ <td id="hgroupmanage">Manage</td>
+ </tr>
+ </thead>
+ <tbody
id="display1"><tr><td>&nbsp;</td></tr></tbody>
+ </table></td>
+ <td valign="top">
+ <div id="scrollbar1" class="scrollbar"><div
class="inscrollbar">&nbsp;</div></div>
+ </td>
+ <td id="buff"></td>
+</tr>
+</table>
+#if($context.action == "inline")
+ <div id="addNewMember">
+ <table cellpadding="5" cellspacing="5">
+ <tr>
+ <td><strong>Add a new user </strong></td>
+ <td>
+ <select name="wiki" onchange="changeWiki(this);">
+ <option value="local"
selected="selected">Local</option>
+ <option value="global">Global</option>
+ </select>
+ </td>
+ <td>
+ <input id="userSuggest" type="text" size="30" name="newMember"
autocomplete="off" onfocus="createSuggest(this, 'user');"/>
+ </td>
+ <td>
+ <input type="button" id="addNewUser" class="button"
value="$msg.get('add')" onclick="addNewMember('user',
$('userSuggest').value);"/>
+ </td>
+ </tr>
+ <tr>
+ <td><strong>Add a new group </strong></td>
+ <td>
+ <select name="wiki" onchange="changeWiki(this);">
+ <option value="local" selected="selected">Local</option>
+ <option value="global">Global</option>
+ </select>
+ </td>
+ <td>
+ <input id="groupSuggest" type="text" size="30" name="newMember"
autocomplete="off" onfocus="createSuggest(this, 'group');"/>
+ </td>
+ <td>
+ <input type="button" id="addNewGroup" class="button"
value="$msg.get('add')" onclick="addNewMember('group',
$('groupSuggest').value);"/>
+ </td>
+ </tr>
+ <tr><td colspan="3" id="errMsg"></td></tr>
+</table>
+</div>
+#end
+#set($url = $doc.getURL("view", "xpage=getgroupmembers"))
+{pre}
+<script type="text/javascript">
+ window.tabl = new ASSTable("$url", 15, "display1", "scrollbar1",
"memberstable", displayMembers, true);
+
+ //create new ajax suggest
+ suggesturl = "$doc.getURL()" + "?xpage=uorgsuggest" + "&" +
"classname=XWiki.XWikiUsers" + "&" + "wiki=local";
+
+ //create a new suggest depending on the wiki, user or group and matching
string params
+ window.createSuggest = function(input, uorg)
+ {
+ if(suggesturl.indexOf("&" + "uorg=") > 0) suggesturl =
suggesturl.substring(0, suggesturl.indexOf("&" + "uorg="));
+ if(uorg == "user")
+ suggesturl += "&" + "uorg=user" + "&";
+ else
+ suggesturl += "&" + "uorg=group" + "&";
+
+ //clear the errors
+ $('errMsg').innerHTML = "";
+ return new ajaxSuggest(input, { script: suggesturl, varname:'input' } );
+}
+
+window.addNewMember = function(uorg, name)
+{
+ //url = adduorg
+ if(name)
+ {
+ var url = "$doc.getURL("view")" + "?xpage=adduorg" + "&" +
"uorg=" + uorg + "&" + "name=" + name;
+ new Ajax.Request(url,
+ {
+ method: 'get',
+ onSuccess: function(transport) {
+ $('userSuggest').value = "";
+ $('groupSuggest').value = "";
+
+ var nr = parseInt(transport.responseText);
+ if(nr == 0) $('errMsg').innerHTML =
"$msg.get("duplicateuser")";
+ else {
+ var end = window.tabl.totalRows + nr;
+ var start = end - window.tabl.limit;
+ if(start < 1) start = 1;
+ window.tabl.showRows(start, end);
+ }
+ }
+ });
+ }
+}
+
+window.changeWiki = function(obj)
+{
+ if(suggesturl.indexOf("&" + "wiki=") >= 0)
+ suggesturl = suggesturl.substring(0, suggesturl.indexOf("&" +
"wiki="));
+ suggesturl += "&" + "wiki=" +
trim(obj.options[obj.selectedIndex].value);
+ // clear errors messages
+ $('errMsg').innerHTML = "";
+}
+
+</script>
+{/pre}
+#else ## stable interface
+1 $doc.name
+
#set($allObjects = $doc.getObjects("XWiki.XWikiGroups"))
#set($itemsPerPage = 50)
#if($request.ipp)
@@ -63,5 +194,7 @@
#end ## foreach
{table}
#end ## inline
-#pagedViewLinks($itemsPerPage $totalPages $crtPageNumber)</content>
+#pagedViewLinks($itemsPerPage $totalPages $crtPageNumber)
+#end
+</content>
</xwikidoc>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
