dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12356
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3784: Fix bug "Don't lock datasets into Data Locking Form" and Removed type="chain" into dhis-web-main...
------------------------------------------------------------
revno: 3784
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-05-30 14:01:39 +0700
message:
Fix bug "Don't lock datasets into Data Locking Form" and Removed type="chain" into dhis-web-maintenance-dataadmin.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetNumberOfLevelsAction.java
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetPeriodTypesAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/datasetLockReport.js
--
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
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetNumberOfLevelsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetNumberOfLevelsAction.java 2010-08-05 15:15:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetNumberOfLevelsAction.java 1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-package org.hisp.dhis.dataadmin.action.lock;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.List;
-
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Brajesh Murari
- * @version $Id$
- */
-public class GetNumberOfLevelsAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private OrganisationUnitService organisationUnitService;
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private List<OrganisationUnitLevel> levels;
-
- public List<OrganisationUnitLevel> getLevels()
- {
- return levels;
- }
-
- // -------------------------------------------------------------------------
- // ActionSupport implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- levels = organisationUnitService.getOrganisationUnitLevels();
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetPeriodTypesAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetPeriodTypesAction.java 2010-08-05 15:15:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/GetPeriodTypesAction.java 2011-05-30 07:01:39 +0000
@@ -27,12 +27,7 @@
package org.hisp.dhis.dataadmin.action.lock;
import java.util.Collection;
-import java.util.List;
-import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
-import org.hisp.dhis.organisationunit.OrganisationUnitGroupService;
-import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.oust.manager.SelectionTreeManager;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
@@ -56,21 +51,6 @@
{
this.periodService = periodService;
}
-
- private OrganisationUnitService organisationUnitService;
-
- public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
- {
- this.organisationUnitService = organisationUnitService;
-
- }
-
- private OrganisationUnitGroupService organisationUnitGroupService;
-
- public void setOrganisationUnitGroupService( OrganisationUnitGroupService organisationUnitGroupService )
- {
- this.organisationUnitGroupService = organisationUnitGroupService;
- }
private SelectionTreeManager selectionTreeManager;
@@ -89,20 +69,6 @@
return periodTypes;
}
- private List<OrganisationUnitLevel> orgUnitLevels;
-
- public List<OrganisationUnitLevel> getOrgUnitLevels()
- {
- return orgUnitLevels;
- }
-
- private Collection<OrganisationUnitGroup> orgUnitGroups;
-
- public Collection<OrganisationUnitGroup> getOrgUnitGroups()
- {
- return orgUnitGroups;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -111,10 +77,6 @@
{
periodTypes = periodService.getAllPeriodTypes();
- orgUnitLevels = organisationUnitService.getFilledOrganisationUnitLevels();
-
- orgUnitGroups = organisationUnitGroupService.getAllOrganisationUnitGroups();
-
selectionTreeManager.clearSelectedOrganisationUnits();
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml 2011-05-24 09:08:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml 2011-05-30 07:01:39 +0000
@@ -6,6 +6,13 @@
<!-- Locking -->
+ <bean id="org.hisp.dhis.dataadmin.action.lock.GetPeriodTypesAction"
+ class="org.hisp.dhis.dataadmin.action.lock.GetPeriodTypesAction"
+ scope="prototype">
+ <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
+ <property name="selectionTreeManager" ref="org.hisp.dhis.oust.manager.SelectionTreeManager" />
+ </bean>
+
<bean id="org.hisp.dhis.dataadmin.action.lock.GetDataSetsForPeriodTypeAction"
class="org.hisp.dhis.dataadmin.action.lock.GetDataSetsForPeriodTypeAction"
scope="prototype">
@@ -27,26 +34,6 @@
<property name="selectionTreeManager"
ref="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
</bean>
-
- <bean id="org.hisp.dhis.dataadmin.action.lock.GetPeriodTypesAction"
- class="org.hisp.dhis.dataadmin.action.lock.GetPeriodTypesAction"
- scope="prototype">
- <property name="periodService" ref="org.hisp.dhis.period.PeriodService"/>
- <property name="organisationUnitService"
- ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- <property name="organisationUnitGroupService"
- ref="org.hisp.dhis.organisationunit.OrganisationUnitGroupService"/>
- <property name="selectionTreeManager"
- ref="org.hisp.dhis.oust.manager.SelectionTreeManager"/>
- </bean>
-
- <bean id="org.hisp.dhis.dataadmin.action.lock.GetNumberOfLevelsAction"
- class="org.hisp.dhis.dataadmin.action.lock.GetNumberOfLevelsAction"
- scope="prototype">
- <property name="organisationUnitService">
- <ref bean="org.hisp.dhis.organisationunit.OrganisationUnitService" />
- </property>
- </bean>
<bean id="org.hisp.dhis.dataadmin.action.lock.GetPeriodsForLockAction"
class="org.hisp.dhis.dataadmin.action.lock.GetPeriodsForLockAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2011-05-24 09:08:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2011-05-30 07:01:39 +0000
@@ -18,12 +18,6 @@
<!-- Locking -->
<action name="displayLockingForm"
- class="org.hisp.dhis.dataadmin.action.lock.GetNumberOfLevelsAction">
- <result name="success" type="chain">
- defineDataSetAssociationsFormChain</result>
- </action>
-
- <action name="defineDataSetAssociationsFormChain"
class="org.hisp.dhis.dataadmin.action.lock.GetPeriodTypesAction">
<interceptor-ref name="organisationUnitTreeStack"/>
<result name="success" type="velocity">/main.vm</result>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/datasetLockReport.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/datasetLockReport.js 2011-04-06 07:25:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/datasetLockReport.js 2011-05-30 07:01:39 +0000
@@ -14,16 +14,16 @@
url += getParamString( "selectedPeriods", "selectedPeriods" );
url += "&" + getParamString( "selectedDataSets", "selectedDataSets" );
- $.postJSON( url, function( json )
+ $.postJSON( url, {}, function( json )
{
if ( json.response == "input" )
{
setHeaderDelayMessage( json.message );
}
- else
+ else if ( json.response == "success" )
{
selectAllById( "selectedPeriods" );
- selectAllById( "selectedDataSets" );
+ selectAllById( "selectedDataSets" );
form.submit();
}
});
