dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02308
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 774: fixed cyclic dependency in dhis-service-user-hibernate & dhis-service-excel-reporting
------------------------------------------------------------
revno: 774
committer: Tran Thanh Tri <Tran Thanh Tri@compaq>
branch nick: trunk
timestamp: Sat 2009-09-26 16:41:54 +0700
message:
fixed cyclic dependency in dhis-service-user-hibernate & dhis-service-excel-reporting
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java
dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-user-hibernate/pom.xml
dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm
--
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 2009-09-25 21:50:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2009-09-26 09:41:54 +0000
@@ -31,6 +31,7 @@
import java.util.Set;
import org.hisp.dhis.dataset.DataSet;
+import org.hisp.dhis.reportexcel.ReportExcel;
/**
* @author Nguyen Hong Duc
@@ -53,6 +54,8 @@
private Set<DataSet> dataSets = new HashSet<DataSet>();
+ private Set<ReportExcel> reportExcels = new HashSet<ReportExcel>();
+
// -------------------------------------------------------------------------
// hashCode and equals
// -------------------------------------------------------------------------
@@ -149,4 +152,14 @@
{
this.dataSets = dataSets;
}
+
+ public Set<ReportExcel> getReportExcels()
+ {
+ return reportExcels;
+ }
+
+ public void setReportExcels( Set<ReportExcel> reportExcels )
+ {
+ this.reportExcels = reportExcels;
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml 2009-09-26 05:31:47 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml 2009-09-26 09:41:54 +0000
@@ -20,34 +20,15 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-jdbc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-datamart-default</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-organisationunit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-mapping</artifactId>
- </dependency>
- <!--
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-user-hibernate</artifactId>
- </dependency>
- -->
-
+ <artifactId>dhis-options</artifactId>
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-support-system</artifactId>
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java 2009-09-25 21:50:41 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/DefaultReportExcelService.java 2009-09-26 09:41:54 +0000
@@ -26,6 +26,7 @@
*/
package org.hisp.dhis.reportexcel;
+import java.util.ArrayList;
import java.util.Collection;
import org.hisp.dhis.dataset.DataSet;
@@ -33,6 +34,9 @@
import org.hisp.dhis.period.Period;
import org.hisp.dhis.reportexcel.status.DataEntryStatus;
import org.hisp.dhis.user.User;
+import org.hisp.dhis.user.UserCredentials;
+import org.hisp.dhis.user.UserStore;
+import org.hisp.dhis.user.UserAuthorityGroup;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -53,14 +57,14 @@
{
this.reportStore = reportStore;
}
-/*
+
private UserStore userStore;
public void setUserStore( UserStore userStore )
{
this.userStore = userStore;
}
-*/
+
// --------------------------------------
// Service of Report
// --------------------------------------
@@ -102,11 +106,11 @@
public Collection<ReportExcel> getReportExcels( User user, boolean superUser, String group )
{
- //if ( user == null || (user != null && superUser) )
+ if ( user == null || (user != null && superUser) )
{
return this.getReportsByGroup( group );
}
- /*
+
else
{
Collection<ReportExcel> reports = new ArrayList<ReportExcel>();
@@ -121,7 +125,7 @@
reports.retainAll( this.getReportsByGroup( group ) );
return reports;
- }*/
+ }
}
public Collection<String> getReportExcelGroups()
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-09-25 21:45:01 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2009-09-26 09:41:54 +0000
@@ -13,7 +13,7 @@
<bean id="org.hisp.dhis.reportexcel.ReportExcelService" class="org.hisp.dhis.reportexcel.DefaultReportExcelService">
<property name="reportStore" ref="org.hisp.dhis.reportexcel.ReportExcelStore" />
- <!-- <property name="userStore" ref="org.hisp.dhis.user.UserStore" /> -->
+ <property name="userStore" ref="org.hisp.dhis.user.UserStore" />
</bean>
<!-- Report Location Manager -->
=== modified file 'dhis-2/dhis-services/dhis-service-user-hibernate/pom.xml'
--- dhis-2/dhis-services/dhis-service-user-hibernate/pom.xml 2009-09-06 15:51:11 +0000
+++ dhis-2/dhis-services/dhis-service-user-hibernate/pom.xml 2009-09-26 09:41:54 +0000
@@ -1,50 +1,53 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-services</artifactId>
- <version>2.0.3-SNAPSHOT</version>
- </parent>
-
- <artifactId>dhis-service-user-hibernate</artifactId>
- <packaging>jar</packaging>
- <name>DHIS User Service - Hibernate</name>
-
- <dependencies>
-
- <!-- DHIS -->
-
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-useradminandsecurity</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-organisationunit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
-
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-services</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>dhis-service-user-hibernate</artifactId>
+ <packaging>jar</packaging>
+ <name>DHIS User Service - Hibernate</name>
+
+ <dependencies>
+
+ <!-- DHIS -->
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-useradminandsecurity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-organisationunit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-support-hibernate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-support-system</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-support-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-excel-reporting</artifactId>
+ </dependency>
+
+ </dependencies>
</project>
=== modified file 'dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml 2009-09-25 21:45:01 +0000
+++ dhis-2/dhis-services/dhis-service-user-hibernate/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml 2009-09-26 09:41:54 +0000
@@ -4,34 +4,40 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
- <class name="org.hisp.dhis.user.UserAuthorityGroup" table="userrole">
-
- <id name="id" column="userroleid">
- <generator class="native"/>
- </id>
-
- <property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
- </property>
-
- <property name="description"/>
-
- <set name="members" table="userrolemembers" inverse="true">
- <key column="userroleid"/>
- <many-to-many column="userid" class="org.hisp.dhis.user.UserCredentials"
- foreign-key="fk_userid"/>
- </set>
-
- <set name="authorities" table="userroleauthorities">
- <key column="userroleid"/>
- <element type="string" column="authority"/>
- </set>
-
- <set name="dataSets" table="userroledataset">
- <key column="userroleid"/>
- <many-to-many column="datasetid" class="org.hisp.dhis.dataset.DataSet"
- foreign-key="fk_datasetid"/>
- </set>
-
- </class>
+ <class name="org.hisp.dhis.user.UserAuthorityGroup" table="userrole">
+
+ <id name="id" column="userroleid">
+ <generator class="native" />
+ </id>
+
+ <property name="name">
+ <column name="name" not-null="true" unique="true" length="160" />
+ </property>
+
+ <property name="description" />
+
+ <set name="members" table="userrolemembers" inverse="true">
+ <key column="userroleid" />
+ <many-to-many column="userid"
+ class="org.hisp.dhis.user.UserCredentials" foreign-key="fk_userid" />
+ </set>
+
+ <set name="authorities" table="userroleauthorities">
+ <key column="userroleid" />
+ <element type="string" column="authority" />
+ </set>
+
+ <set name="dataSets" table="userroledataset">
+ <key column="userroleid" />
+ <many-to-many column="datasetid" class="org.hisp.dhis.dataset.DataSet"
+ foreign-key="fk_datasetid" />
+ </set>
+
+ <set name="reportExcels" table="userrolereportexcel">
+ <key column="userroleid" />
+ <many-to-many column="reportexcelid" class="org.hisp.dhis.reportexcel.ReportExcel"
+ foreign-key="fk_reportexcelid" />
+ </set>
+
+ </class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml 2009-09-25 06:10:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml 2009-09-26 09:41:54 +0000
@@ -1,55 +1,51 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-maintenance</artifactId>
- <version>2.0.3-SNAPSHOT</version>
- </parent>
-
- <artifactId>dhis-web-maintenance-user</artifactId>
- <packaging>war</packaging>
- <name>DHIS User Maintenance</name>
-
- <build>
- <finalName>dhis-web-maintenance-user</finalName>
- </build>
-
- <dependencies>
-
- <!-- DHIS -->
-
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-useradminandsecurity</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-user-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons-resources</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-excel-reporting</artifactId>
- </dependency>
-
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-maintenance</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>dhis-web-maintenance-user</artifactId>
+ <packaging>war</packaging>
+ <name>DHIS User Maintenance</name>
+
+ <build>
+ <finalName>dhis-web-maintenance-user</finalName>
+ </build>
+
+ <dependencies>
+
+ <!-- DHIS -->
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-useradminandsecurity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-user-hibernate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-support-system</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons-resources</artifactId>
+ <type>war</type>
+ </dependency>
+
+
+ </dependencies>
</project>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java 2009-09-26 05:31:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java 2009-09-26 09:41:54 +0000
@@ -134,7 +134,7 @@
ReportExcel reportExcel = reportExcelService.getReportExcel( Integer.parseInt( id ) );
- //group.getReportExcels().add( reportExcel );
+ group.getReportExcels().add( reportExcel );
}
group.getAuthorities().addAll( selectedListAuthority );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java 2009-09-26 05:31:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java 2009-09-26 09:41:54 +0000
@@ -189,13 +189,13 @@
availableReportExcels = new ArrayList<ReportExcel>( reportExcelService.getALLReportExcel() );
- // reportExcels = new ArrayList<ReportExcel>( userAuthorityGroup.getReportExcels() );
+ reportExcels = new ArrayList<ReportExcel>( userAuthorityGroup.getReportExcels() );
- //availableReportExcels.removeAll( reportExcels );
+ availableReportExcels.removeAll( reportExcels );
Collections.sort( availableReportExcels, new ReportExcelNameComparator() );
-
- //Collections.sort( reportExcels, new ReportExcelNameComparator() );
+
+ Collections.sort( reportExcels, new ReportExcelNameComparator() );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java 2009-09-26 05:31:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java 2009-09-26 09:41:54 +0000
@@ -145,7 +145,7 @@
ReportExcel reportExcel = reportExcelService.getReportExcel( Integer.parseInt( id ) );
- //group.getReportExcels().add( reportExcel );
+ group.getReportExcels().add( reportExcel );
}
group.getAuthorities().addAll( selectedListAuthority );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm 2009-09-26 05:31:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm 2009-09-26 09:41:54 +0000
@@ -45,7 +45,7 @@
</select>
</td>
</tr>
- <!--
+
<tr>
<td><label>$i18n.getString( "excel_reporting" )</label></td>
<td>
@@ -64,7 +64,7 @@
</select>
</td>
</tr>
- -->
+
<tr>
<td><label>$i18n.getString( "authorities" )</label></td>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js 2009-09-26 05:31:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js 2009-09-26 09:41:54 +0000
@@ -57,7 +57,7 @@
{
selectAll( document.getElementById( 'selectedList' ) );
selectAll( document.getElementById( 'selectedListAuthority' ) );
- //selectAll( document.getElementById( 'selectedReportExcel' ) );
+ selectAll( document.getElementById( 'selectedReportExcel' ) );
var form = document.getElementById( 'addRoleForm' );
form.submit();
@@ -98,7 +98,7 @@
{
selectAll( document.getElementById( 'selectedList' ) );
selectAll( document.getElementById( 'selectedListAuthority' ) );
- //selectAll( document.getElementById( 'selectedReportExcel' ) );
+ selectAll( document.getElementById( 'selectedReportExcel' ) );
var form = document.getElementById( 'updateRoleForm' );
form.submit();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm 2009-09-26 05:31:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm 2009-09-26 09:41:54 +0000
@@ -52,7 +52,7 @@
</select>
</td>
</tr>
- <!--
+
<tr>
<td><label>$i18n.getString( "excel_reporting" )</label></td>
<td>
@@ -74,7 +74,7 @@
</select>
</td>
</tr>
- -->
+
<tr>
<td><label>$i18n.getString( "authorities" )</label></td>
<td>
