------------------------------------------------------------
revno: 11794
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Sun 2013-08-25 23:06:44 +0200
message:
Data set, bumping version on edit if render-as-tabs has changed
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.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-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2013-08-25 21:06:44 +0000
@@ -274,8 +274,11 @@
dataSet.setExpiryDays( expiryDays );
dataSet.setSkipAggregation( skipAggregation );
- if ( !(equalsNullSafe( name, dataSet.getName() ) && periodType.equals( dataSet.getPeriodType() )
- && dataElements.equals( dataSet.getDataElements() ) && indicators.equals( dataSet.getIndicators() )) )
+ if ( !( equalsNullSafe( name, dataSet.getName() ) &&
+ periodType.equals( dataSet.getPeriodType() ) &&
+ dataElements.equals( dataSet.getDataElements() ) &&
+ indicators.equals( dataSet.getIndicators() ) &&
+ renderAsTabs == dataSet.isRenderAsTabs() ) )
{
dataSet.increaseVersion(); // Check if version must be updated
}
_______________________________________________
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
