------------------------------------------------------------
revno: 7886
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Thu 2012-08-09 20:16:13 +0700
message:
minor webapi changes related to userAuthorityGroups
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserAuthorityGroupController.java
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2012-04-20 18:31:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2012-08-09 13:16:13 +0000
@@ -47,7 +47,7 @@
/**
* @author Nguyen Hong Duc
*/
-@JacksonXmlRootElement( localName = "userAuthorityGroup", namespace = Dxf2Namespace.NAMESPACE )
+@JacksonXmlRootElement( localName = "userRole", namespace = Dxf2Namespace.NAMESPACE )
public class UserAuthorityGroup
extends BaseIdentifiableObject
{
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserAuthorityGroupController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserAuthorityGroupController.java 2012-05-28 14:25:12 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserAuthorityGroupController.java 2012-08-09 13:16:13 +0000
@@ -40,5 +40,5 @@
public class UserAuthorityGroupController
extends AbstractCrudController<UserAuthorityGroup>
{
- public static final String RESOURCE_PATH = "/userAuthorityGroups";
+ public static final String RESOURCE_PATH = "/userRoles";
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl 2012-04-08 20:23:29 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl 2012-08-09 13:16:13 +0000
@@ -3,8 +3,8 @@
xmlns:d="http://dhis2.org/schema/dxf/2.0";
>
- <xsl:template match="d:userAuthorityGroup">
- <div class="userAuthorityGroup">
+ <xsl:template match="d:userRole">
+ <div class="userRole">
<h2>
<xsl:value-of select="@name" />
</h2>
@@ -40,10 +40,10 @@
<li><xsl:value-of select="." /> </li>
</xsl:template>
- <xsl:template match="d:userAuthorityGroups" mode="short">
+ <xsl:template match="d:userRoles" mode="short">
<xsl:if test="count(child::*) > 0">
- <h3>UserAuthorityGroups</h3>
- <table class="userAuthorityGroups">
+ <h3>UserRoles</h3>
+ <table class="userRoles">
<xsl:apply-templates select="child::*" mode="row"/>
</table>
</xsl:if>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
