dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12331
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3768: cleanup in add/update data element group/group set
------------------------------------------------------------
revno: 3768
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-05-27 12:24:03 +0200
message:
cleanup in add/update data element group/group set
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenAddDataElementGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenAddIndicatorGroupSetAction.java
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupMembersAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/PeriodTypeListAction.java
--
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-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupAction.java 2011-05-05 21:15:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupAction.java 2011-05-27 10:24:03 +0000
@@ -34,7 +34,6 @@
/**
* @author Torgeir Lorange Ostby
- * @version $Id: GetDataElementGroupAction.java 2869 2007-02-20 14:26:09Z andegje $
*/
public class GetDataElementGroupAction
implements Action
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupMembersAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupMembersAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupMembersAction.java 2011-05-27 10:24:03 +0000
@@ -41,7 +41,6 @@
/**
* @author Torgeir Lorange Ostby
- * @version $Id: GetDataElementGroupMembersAction.java 6475 2008-11-25 15:42:55Z larshelg $
*/
public class GetDataElementGroupMembersAction
implements Action
@@ -101,13 +100,6 @@
return groupMembers;
}
- private List<DataElement> availableDataElements = new ArrayList<DataElement>();
-
- public List<DataElement> getAvailableDataElements()
- {
- return availableDataElements;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -129,18 +121,6 @@
displayPropertyHandler.handle( groupMembers );
}
- // ---------------------------------------------------------------------
- // Get available elements
- // ---------------------------------------------------------------------
-
- availableDataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
-
- availableDataElements.removeAll( groupMembers );
-
- Collections.sort( availableDataElements, dataElementComparator );
-
- displayPropertyHandler.handle( availableDataElements );
-
return SUCCESS;
}
}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenAddDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenAddDataElementGroupSetAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenAddDataElementGroupSetAction.java 1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-package org.hisp.dhis.dd.action.dataelementgroupset;
-
-/*
- * 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.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.dataelement.DataElementGroup;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
-import org.hisp.dhis.system.filter.DataElementGroupWithoutGroupSetFilter;
-import org.hisp.dhis.system.util.FilterUtils;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Oeverland
- */
-public class OpenAddDataElementGroupSetAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- // -------------------------------------------------------------------------
- // Input & Ouput
- // -------------------------------------------------------------------------
-
- private List<DataElementGroup> availableGroups;
-
- public List<DataElementGroup> getAvailableGroups()
- {
- return availableGroups;
- }
-
- public String execute()
- throws Exception
- {
- availableGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
-
- FilterUtils.filter( availableGroups, new DataElementGroupWithoutGroupSetFilter() );
-
- Collections.sort( availableGroups, new DataElementGroupNameComparator() );
-
- return SUCCESS;
- }
-}
-
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java 2011-05-27 10:24:03 +0000
@@ -27,7 +27,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -35,14 +34,11 @@
import org.hisp.dhis.dataelement.DataElementGroupSet;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataelement.comparator.DataElementGroupNameComparator;
-import org.hisp.dhis.system.filter.DataElementGroupWithoutGroupSetFilter;
-import org.hisp.dhis.system.util.FilterUtils;
import com.opensymphony.xwork2.Action;
/**
* @author Tran Thanh Tri
- * @version $Id$
*/
public class OpenUpdateDataElementGroupSetAction
implements Action
@@ -76,13 +72,6 @@
return dataElementGroupSet;
}
- private List<DataElementGroup> availableGroups;
-
- public List<DataElementGroup> getAvailableGroups()
- {
- return availableGroups;
- }
-
private List<DataElementGroup> selectedGroups;
public List<DataElementGroup> getSelectedGroups()
@@ -94,14 +83,6 @@
throws Exception
{
dataElementGroupSet = dataElementService.getDataElementGroupSet( id );
-
- availableGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
-
- availableGroups.removeAll( dataElementGroupSet.getMembers() );
-
- FilterUtils.filter( availableGroups, new DataElementGroupWithoutGroupSetFilter() );
-
- Collections.sort( availableGroups, new DataElementGroupNameComparator() );
selectedGroups = dataElementGroupSet.getMembers();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java 2011-05-05 21:15:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java 2011-05-27 10:24:03 +0000
@@ -41,7 +41,6 @@
/**
* @author Torgeir Lorange Ostby
- * @version $Id: GetIndicatorGroupMembersAction.java 6475 2008-11-25 15:42:55Z larshelg $
*/
public class GetIndicatorGroupMembersAction
implements Action
@@ -67,7 +66,7 @@
{
this.indicatorComparator = indicatorComparator;
}
-
+
// -------------------------------------------------------------------------
// DisplayPropertyHandler
// -------------------------------------------------------------------------
@@ -101,13 +100,6 @@
return groupMembers;
}
- private List<Indicator> availableIndicators = new ArrayList<Indicator>();
-
- public List<Indicator> getAvailableIndicators()
- {
- return availableIndicators;
- }
-
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -125,22 +117,10 @@
groupMembers = new ArrayList<Indicator>( group.getMembers() );
Collections.sort( groupMembers, indicatorComparator );
-
+
displayPropertyHandler.handle( groupMembers );
}
- // ---------------------------------------------------------------------
- // Get available elements
- // ---------------------------------------------------------------------
-
- availableIndicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
-
- availableIndicators.removeAll( groupMembers );
-
- Collections.sort( availableIndicators, indicatorComparator );
-
- displayPropertyHandler.handle( availableIndicators );
-
return SUCCESS;
}
}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenAddIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenAddIndicatorGroupSetAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenAddIndicatorGroupSetAction.java 1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-package org.hisp.dhis.dd.action.indicatorgroupset;
-
-/*
- * 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.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.hisp.dhis.indicator.IndicatorGroup;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
-import org.hisp.dhis.system.filter.IndicatorGroupWIthoutGroupSetFilter;
-import org.hisp.dhis.system.util.FilterUtils;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Lars Helge Overland
- */
-public class OpenAddIndicatorGroupSetAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- // -------------------------------------------------------------------------
- // Input & Ouput
- // -------------------------------------------------------------------------
-
- private List<IndicatorGroup> availableGroups;
-
- public List<IndicatorGroup> getAvailableGroups()
- {
- return availableGroups;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- availableGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
-
- FilterUtils.filter( availableGroups, new IndicatorGroupWIthoutGroupSetFilter() );
-
- Collections.sort( availableGroups, new IndicatorGroupNameComparator() );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java 2011-05-27 10:24:03 +0000
@@ -27,7 +27,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -35,14 +34,11 @@
import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
-import org.hisp.dhis.system.filter.IndicatorGroupWIthoutGroupSetFilter;
-import org.hisp.dhis.system.util.FilterUtils;
import com.opensymphony.xwork2.Action;
/**
* @author Tran Thanh Tri
- * @version $Id$
*/
public class OpenUpdateIndicatorGroupSetAction
implements Action
@@ -76,13 +72,6 @@
return indicatorGroupSet;
}
- private List<IndicatorGroup> availableGroups;
-
- public List<IndicatorGroup> getAvailableGroups()
- {
- return availableGroups;
- }
-
private List<IndicatorGroup> selectedGroups;
public List<IndicatorGroup> getSelectedGroups()
@@ -98,14 +87,6 @@
{
indicatorGroupSet = indicatorService.getIndicatorGroupSet( id );
- availableGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
-
- availableGroups.removeAll( indicatorGroupSet.getMembers() );
-
- FilterUtils.filter( availableGroups, new IndicatorGroupWIthoutGroupSetFilter() );
-
- Collections.sort( availableGroups, new IndicatorGroupNameComparator() );
-
selectedGroups = indicatorGroupSet.getMembers();
Collections.sort( selectedGroups, new IndicatorGroupNameComparator() );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2011-04-24 15:50:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2011-05-27 10:24:03 +0000
@@ -231,15 +231,6 @@
</property>
</bean>
- <bean
- id="org.hisp.dhis.dd.action.dataelementgroupset.OpenAddDataElementGroupSetAction"
- class="org.hisp.dhis.dd.action.dataelementgroupset.OpenAddDataElementGroupSetAction"
- scope="prototype">
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService" />
- </property>
- </bean>
-
<bean
id="org.hisp.dhis.dd.action.dataelementgroupset.OpenUpdateDataElementGroupSetAction"
class="org.hisp.dhis.dd.action.dataelementgroupset.OpenUpdateDataElementGroupSetAction"
@@ -387,15 +378,6 @@
</property>
</bean>
- <bean
- id="org.hisp.dhis.dd.action.indicatorgroupset.OpenAddIndicatorGroupSetAction"
- class="org.hisp.dhis.dd.action.indicatorgroupset.OpenAddIndicatorGroupSetAction"
- scope="prototype">
- <property name="indicatorService">
- <ref bean="org.hisp.dhis.indicator.IndicatorService" />
- </property>
- </bean>
-
<bean
id="org.hisp.dhis.dd.action.indicatorgroupset.OpenUpdateIndicatorGroupSetAction"
class="org.hisp.dhis.dd.action.indicatorgroupset.OpenUpdateIndicatorGroupSetAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2011-05-03 12:32:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2011-05-27 10:24:03 +0000
@@ -170,7 +170,7 @@
</action>
<action name="showAddDataElementGroupForm"
- class="org.hisp.dhis.dd.action.dataelementgroup.GetDataElementGroupMembersAction">
+ class="org.hisp.dhis.dd.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm</param>
<param name="javascripts">javascript/dataElementGroup.js</param>
@@ -227,7 +227,7 @@
</action>
<action name="openAddDataElementGroupSet"
- class="org.hisp.dhis.dd.action.dataelementgroupset.OpenAddDataElementGroupSetAction">
+ class="org.hisp.dhis.dd.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
@@ -431,7 +431,7 @@
</action>
<action name="showAddIndicatorGroupForm"
- class="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupMembersAction">
+ class="org.hisp.dhis.dd.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm</param>
<param name="javascripts">javascript/indicatorGroup.js</param>
@@ -488,7 +488,7 @@
</action>
<action name="openAddIndicatorGroupSet"
- class="org.hisp.dhis.dd.action.indicatorgroupset.OpenAddIndicatorGroupSetAction">
+ class="org.hisp.dhis.dd.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/PeriodTypeListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/PeriodTypeListAction.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/PeriodTypeListAction.java 2011-05-27 10:24:03 +0000
@@ -38,7 +38,6 @@
/**
* @author Kristian
- * @version $Id: PeriodTypeListAction.java 5282 2008-05-28 10:41:06Z larshelg $
*/
public class PeriodTypeListAction
implements Action
