------------------------------------------------------------
revno: 3477
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Wed 2011-04-27 18:07:05 +0200
message:
Bumped indian module versions
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-in-api/pom.xml
local/in/dhis-in-services/dhis-in-service-configuration/pom.xml
local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml
local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml
local/in/dhis-in-services/dhis-in-service-reports/pom.xml
local/in/dhis-in-services/dhis-in-service-survey/pom.xml
local/in/dhis-in-services/pom.xml
local/in/dhis-web-dashboard/pom.xml
local/in/dhis-web-dataentry-linelisting/pom.xml
local/in/dhis-web-excelimport/pom.xml
local/in/dhis-web-maintenance-in/pom.xml
local/in/dhis-web-reports-national/pom.xml
local/in/dhis-web-survey/pom.xml
local/in/pom.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 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java 2011-04-27 08:32:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java 2011-04-27 16:07:05 +0000
@@ -44,7 +44,6 @@
import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.editor.EditorManager;
import org.hisp.dhis.user.UserSettingService;
import com.opensymphony.xwork2.Action;
@@ -88,18 +87,6 @@
this.userSettingService = userSettingService;
}
- private EditorManager editorManager;
-
- public EditorManager getEditorManager()
- {
- return editorManager;
- }
-
- public void setEditorManager( EditorManager editorManager )
- {
- this.editorManager = editorManager;
- }
-
// -------------------------------------------------------------------------
// Getters & Setters
// -------------------------------------------------------------------------
@@ -153,26 +140,18 @@
public String execute()
throws Exception
{
-
dataSet = dataSetService.getDataSet( dataSetId );
dataEntryForm = dataSet.getDataEntryForm();
- dataEntryValue = prepareDataEntryFormCode( dataEntryForm.getHtmlCode() );
+ if ( dataEntryForm != null )
+ {
+ dataEntryValue = prepareDataEntryFormCode( dataEntryForm.getHtmlCode() );
+ }
- if ( dataEntryForm != null )
- {
- editorManager.setValue( prepareDataEntryFormCode( dataEntryForm.getHtmlCode() ) );
- }
- else
- {
- editorManager.setValue( "" );
- }
-
autoSave = (Boolean) userSettingService.getUserSetting( UserSettingService.AUTO_SAVE_DATA_ENTRY_FORM, false );
- operands = new ArrayList<DataElementOperand>( dataElementCategoryService.getFullOperands( dataSet
- .getDataElements() ) );
+ operands = new ArrayList<DataElementOperand>( dataElementCategoryService.getFullOperands( dataSet.getDataElements() ) );
Collections.sort( operands, new DataElementOperandNameComparator() );
@@ -183,7 +162,6 @@
* Prepares the data entry form code by injecting the dataElement name for
* each entry field
*
- *
* @param dataEntryFormCode HTML code of the data entry form (as persisted
* in the database)
* @return HTML code for the data entry form injected with dataelement name
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-04-22 17:45:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-04-27 16:07:05 +0000
@@ -313,7 +313,6 @@
<property name="userSettingService">
<ref bean="org.hisp.dhis.user.UserSettingService"/>
</property>
- <property name="editorManager" ref="editorManager"/>
</bean>
<bean id="org.hisp.dhis.dataset.action.dataentryform.SaveDataEntryFormAction"
=== modified file 'local/in/dhis-in-api/pom.xml'
--- local/in/dhis-in-api/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-in-api/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-api</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-configuration/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-configuration</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-dbmanager</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-linelisting</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-reports/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-reports/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-reports</artifactId>
=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/pom.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-in-services</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-service-survey</artifactId>
=== modified file 'local/in/dhis-in-services/pom.xml'
--- local/in/dhis-in-services/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-in-services/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-in-services</artifactId>
=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-dashboard/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dashboard</artifactId>
=== modified file 'local/in/dhis-web-dataentry-linelisting/pom.xml'
--- local/in/dhis-web-dataentry-linelisting/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-dataentry-linelisting/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dataentry-national</artifactId>
=== modified file 'local/in/dhis-web-excelimport/pom.xml'
--- local/in/dhis-web-excelimport/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-excelimport/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-excelimport</artifactId>
=== modified file 'local/in/dhis-web-maintenance-in/pom.xml'
--- local/in/dhis-web-maintenance-in/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-maintenance-in/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-maintenance-in</artifactId>
=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-reports-national/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-reports-national</artifactId>
=== modified file 'local/in/dhis-web-survey/pom.xml'
--- local/in/dhis-web-survey/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/dhis-web-survey/pom.xml 2011-04-27 16:07:05 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-survey</artifactId>
=== modified file 'local/in/pom.xml'
--- local/in/pom.xml 2011-03-02 03:38:25 +0000
+++ local/in/pom.xml 2011-04-27 16:07:05 +0000
@@ -5,7 +5,7 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-local</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Local India Modules</name>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
