------------------------------------------------------------
revno: 2693
committer: Tran Chau <tran.hispviet...@gmail.com>
branch nick: dhis2
timestamp: Fri 2011-01-21 11:51:55 +0700
message:
Fix bug: Dataelements get removed from dataset if filter is active when
saving a dataset.
modified:
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/addSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm
--
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/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 2011-01-20 15:03:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm 2011-01-21 04:51:55 +0000
@@ -1,7 +1,12 @@
<script>
jQuery(document).ready( function()
{
- validation( 'addDataSetForm', function( form ){ form.submit() }, function(){ selectAllById('selectedList') });
+ validation( 'addDataSetForm', function( form ){ form.submit() }
+ , function()
+ {
+ filterList( '', 'selectedList' );
+ selectAllById('selectedList')
+ });
checkValueIsExist( "name", "validateDataSet.action" );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2011-01-20 15:03:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm 2011-01-21 04:51:55 +0000
@@ -1,7 +1,12 @@
<script>
jQuery(document).ready( function()
{
- validation( 'addSectionForm', function( form ){ form.submit() }, function(){ selectAllById('selectedList') });
+ validation( 'addSectionForm', function( form ){ form.submit() }
+ , function()
+ {
+ filterList( '', 'selectedList' );
+ selectAllById('selectedList')
+ });
checkValueIsExist( "sectionName", "validateSection.action", {
dataSetId:function(){return jQuery("#dataSetId").val()}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2011-01-20 15:03:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2011-01-21 04:51:55 +0000
@@ -1,7 +1,12 @@
<script>
jQuery(document).ready( function()
{
- validation( 'editDataSetForm', function( form ){ form.submit() }, function(){ selectAllById('selectedList') });
+ validation( 'editDataSetForm', function( form ){ form.submit() }
+ , function()
+ {
+ filterList( '', 'selectedList' );
+ selectAllById('selectedList')
+ });
checkValueIsExist( "name", "validateDataSet.action", {dataSetId: function(){return jQuery("#dataSetId").val()}});
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2011-01-20 15:03:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2011-01-21 04:51:55 +0000
@@ -1,7 +1,12 @@
<script>
jQuery(document).ready( function()
{
- validation( 'editDataSetForm', function( form ){ form.submit() }, function(){ selectAllById('selectedList') });
+ validation( 'editDataSetForm', function( form ){ form.submit() }
+ , function()
+ {
+ filterList( '', 'selectedList' );
+ selectAllById('selectedList')
+ });
checkValueIsExist( "sectionName", "validateSection.action", {
dataSetId:function(){return jQuery("#dataSetId").val()}
_______________________________________________
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
