dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9444
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-01-07 14:42:21 +0700
message:
  local vn - Fixed struts.xml and beans.xml
modified:
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml
  local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml


--
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 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml	2013-01-03 10:00:51 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/META-INF/dhis/beans.xml	2013-01-07 07:42:21 +0000
@@ -1540,8 +1540,8 @@
 	
 	<!-- OrganisationUnit -->
 	
-	<bean id="org.hisp.dhis.reportsheet.organisationunit.ShowAddDepartmentFormAction"
-		class="org.hisp.dhis.reportsheet.organisationunit.ShowAddDepartmentFormAction"
+	<bean id="org.hisp.dhis.reportsheet.organisationunit.action.ShowAddDepartmentFormAction"
+		class="org.hisp.dhis.reportsheet.organisationunit.action.ShowAddDepartmentFormAction"
 		scope="prototype">
 		<property name="organisationUnitService">
 		  <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService" />
@@ -1554,8 +1554,8 @@
 		</property>
 	</bean>
   
-	<bean id="org.hisp.dhis.reportsheet.organisationunit.AddDepartmentAction"
-		class="org.hisp.dhis.reportsheet.organisationunit.AddDepartmentAction"
+	<bean id="org.hisp.dhis.reportsheet.organisationunit.action.AddDepartmentAction"
+		class="org.hisp.dhis.reportsheet.organisationunit.action.AddDepartmentAction"
 		scope="prototype">
 		<property name="organisationUnitService">
 		  <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService" />

=== modified file 'local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml	2013-01-03 10:00:51 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/resources/struts.xml	2013-01-07 07:42:21 +0000
@@ -1875,15 +1875,15 @@
 
 		<!-- OrganisationUnit -->
 
-		<action name="department" class="org.hisp.dhis.reportsheet.organisationunit.ShowAddDepartmentFormAction">
+		<action name="department" class="org.hisp.dhis.reportsheet.organisationunit.action.ShowAddDepartmentFormAction">
 		  <result name="success" type="velocity">/main.vm</result>
-		  <param name="page">/dhis-web-maintenance-organisationunit/department.vm</param>
-		  <param name="menu">/dhis-web-maintenance-organisationunit/menuWithTree.vm</param>
+		  <param name="page">/dhis-web-spreadsheet-reporting/department.vm</param>
+		  <param name="menu">/dhis-web-spreadsheet-reporting/menuWithTree.vm</param>
 		  <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/department.js</param>
 		  <interceptor-ref name="organisationUnitTreeStack" />
 		</action>
 
-		<action name="addDepartment" class="org.hisp.dhis.reportsheet.organisationunit.AddDepartmentAction">
+		<action name="addDepartment" class="org.hisp.dhis.reportsheet.organisationunit.action.AddDepartmentAction">
 		  <result name="success" type="redirect">department.action</result>
 		  <param name="requiredAuthorities">F_ORGANISATIONUNIT_ADD</param>
 		</action>