=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/NoAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/NoAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/NoAction.java 2009-11-03 09:05:08 +0000
@@ -0,0 +1,43 @@
+package org.hisp.dhis.dataset.action;
+
+/*
+ * Copyright (c) 2004-2007, 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 com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * @author Lars Helge Overland
+ * @version $Id: NoAction.java 4279 2007-12-11 18:41:22Z larshelg $
+ */
+public class NoAction
+ extends ActionSupport
+{
+ public String execute()
+ {
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2009-09-05 07:00:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2009-11-03 09:05:08 +0000
@@ -12,7 +12,6 @@
group_filter = Group filter
all = All
cancel = Cancel
-dataset_management = Dataset management
add_new = Add new
operations = Operations
define_associations = Assign dataset to organisation units
@@ -57,7 +56,7 @@
no_more_elements_to_select = All data elements have been placed in the form. Deleting data element fields from the form will make them reappear in this popup. Please click Cancel to return to the form.
select_dataset = Select dataset
sort_section = Sort section
-section_management = Dataset Section Management
+dataset_section = Dataset Section
label = Label
group = Group
unselect_all_at_level = Unselect all at level
@@ -102,3 +101,7 @@
edit_custom_values = Edit custom values
select_customvalue = Selected Custom Values
selectdataelement = Available Data Elements
+dataset_management = Dataset management
+section_management = Dataset Section management
+intro_dataset = Create, update, view and delete data sets. A data set is a collection of data elements for which data is entered. This page also lets you define custom data entry screens and option lists.
+intro_dataset_section = Create, update, view and delete data set sections. Sections can be inserted into data sets to make them more comprehensible.
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2009-09-03 17:43:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2009-11-03 09:05:08 +0000
@@ -8,6 +8,12 @@
+
+ /main.vm
+ /dhis-web-maintenance-dataset/index.vm
+ /dhis-web-maintenance-dataset/menu.vm
+
+
F_DATASET_UPDATE
-
+
-
+ /main.vm
/dhis-web-maintenance-dataset/dataSetList.vm
/dhis-web-maintenance-dataset/menu.vm
@@ -94,7 +100,7 @@
- index.action
+ dataSet.action
@@ -158,19 +164,19 @@
- index.action
+ dataSet.action
F_DATASET_ADD
- index.action
+ dataSet.action
F_DATASET_UPDATE
- index.action
+ dataSet.action
F_DATASET_DELETE
@@ -192,7 +198,7 @@
- index.action
+ dataSet.action
F_DATASET_UPDATE
@@ -246,7 +252,7 @@
- index.action
+ dataSet.action
- index.action
+ dataSet.action/dhis-web-maintenance-dataset/responseInput.vm
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2009-11-03 09:05:08 +0000
@@ -91,7 +91,7 @@