=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryOptionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryOptionAction.java 2015-08-19 05:26:31 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryOptionAction.java 2015-11-18 06:20:27 +0000 @@ -152,7 +152,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( dataElementCategoryOption.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( dataElementCategoryOption, dataElementCategoryOption.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryOptionAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryOptionAction.java 2015-08-19 05:26:31 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryOptionAction.java 2015-11-18 06:20:27 +0000 @@ -164,7 +164,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( categoryOption.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( categoryOption, categoryOption.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/AddCategoryOptionGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/AddCategoryOptionGroupAction.java 2015-08-19 11:13:46 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/AddCategoryOptionGroupAction.java 2015-11-18 06:20:27 +0000 @@ -124,7 +124,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( categoryOptionGroup.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( categoryOptionGroup, categoryOptionGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/UpdateCategoryOptionGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/UpdateCategoryOptionGroupAction.java 2015-08-19 05:26:31 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/UpdateCategoryOptionGroupAction.java 2015-11-18 06:20:27 +0000 @@ -124,7 +124,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( categoryOptionGroup.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( categoryOptionGroup, categoryOptionGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2015-11-16 05:51:35 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2015-11-18 06:20:27 +0000 @@ -235,7 +235,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( dataElement.getAttributeValues(), jsonAttributeValues, attributeService ); + AttributeUtils.updateAttributeValuesFromJson( dataElement, dataElement.getAttributeValues(), jsonAttributeValues, attributeService ); } dataElementService.addDataElement( dataElement ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2015-10-19 19:21:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2015-11-18 06:20:27 +0000 @@ -285,7 +285,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( dataElement.getAttributeValues(), jsonAttributeValues, attributeService ); + AttributeUtils.updateAttributeValuesFromJson( dataElement, dataElement.getAttributeValues(), jsonAttributeValues, attributeService ); } dataElementService.updateDataElement( dataElement ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/AddDataElementGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/AddDataElementGroupAction.java 2015-03-11 11:01:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/AddDataElementGroupAction.java 2015-11-18 06:20:27 +0000 @@ -133,7 +133,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( dataElementGroup.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( dataElementGroup, dataElementGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/UpdateDataElementGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/UpdateDataElementGroupAction.java 2015-03-11 11:01:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/UpdateDataElementGroupAction.java 2015-11-18 06:20:27 +0000 @@ -146,7 +146,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( dataElementGroup.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( dataElementGroup, dataElementGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java 2015-03-11 11:01:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java 2015-11-18 06:20:27 +0000 @@ -28,10 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Collection; -import java.util.HashSet; -import java.util.List; - +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.indicator.Indicator; @@ -42,7 +39,9 @@ import org.hisp.dhis.legend.LegendSet; import org.hisp.dhis.system.util.AttributeUtils; -import com.opensymphony.xwork2.Action; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; /** * @author Torgeir Lorange Ostby @@ -113,7 +112,7 @@ { this.annualized = annualized; } - + private Integer decimals; public void setDecimals( Integer decimals ) @@ -194,7 +193,7 @@ IndicatorType indicatorType = indicatorService.getIndicatorType( indicatorTypeId ); LegendSet legendSet = legendService.getLegendSet( selectedLegendSetId ); - + Indicator indicator = new Indicator(); indicator.setName( StringUtils.trimToNull( name ) ); @@ -213,10 +212,10 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( indicator.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( indicator, indicator.getAttributeValues(), jsonAttributeValues, attributeService ); } - + indicatorService.addIndicator( indicator ); for ( String id : selectedGroups ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java 2015-03-11 11:01:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java 2015-11-18 06:20:27 +0000 @@ -248,7 +248,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( indicator.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( indicator, indicator.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java 2015-03-11 11:01:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java 2015-11-18 06:20:27 +0000 @@ -30,7 +30,6 @@ import com.google.common.collect.Lists; import com.opensymphony.xwork2.Action; - import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.indicator.IndicatorGroup; @@ -113,7 +112,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( indicatorGroup.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( indicatorGroup, indicatorGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java 2015-03-11 11:01:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java 2015-11-18 06:20:27 +0000 @@ -30,7 +30,6 @@ import com.google.common.collect.Lists; import com.opensymphony.xwork2.Action; - import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.indicator.Indicator; @@ -115,7 +114,7 @@ indicatorGroup = indicatorService.getIndicatorGroup( id ); indicatorGroup.setName( StringUtils.trimToNull( name ) ); - + Set members = new HashSet<>(); for ( String id : inSelected ) @@ -125,7 +124,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( indicatorGroup.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( indicatorGroup, indicatorGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2015-11-02 04:27:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2015-11-18 06:20:27 +0000 @@ -28,10 +28,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import com.google.common.collect.Lists; +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.dataelement.DataElementCategoryService; @@ -47,8 +45,9 @@ import org.hisp.dhis.user.UserGroupService; import org.hisp.dhis.user.UserService; -import com.google.common.collect.Lists; -import com.opensymphony.xwork2.Action; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Kristian @@ -108,7 +107,7 @@ { this.attributeService = attributeService; } - + private LegendService legendService; public void setLegendService( LegendService legendService ) @@ -280,14 +279,14 @@ { this.jsonAttributeValues = jsonAttributeValues; } - + private boolean mobile; - + public void setMobile( boolean mobile ) { this.mobile = mobile; } - + // ------------------------------------------------------------------------- // Action // ------------------------------------------------------------------------- @@ -299,7 +298,7 @@ PeriodType periodType = PeriodType.getPeriodTypeByName( frequencySelect ); DataSet dataSet = new DataSet(); - + dataSet.setName( StringUtils.trimToNull( name ) ); dataSet.setShortName( StringUtils.trimToNull( shortName ) ); dataSet.setCode( StringUtils.trimToNull( code ) ); @@ -347,7 +346,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( dataSet.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( dataSet, dataSet.getAttributeValues(), jsonAttributeValues, attributeService ); } === 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 2015-11-02 04:27:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java 2015-11-18 06:20:27 +0000 @@ -28,12 +28,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.commons.util.TextUtils.equalsNullSafe; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import com.google.common.collect.Lists; +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.dataelement.DataElement; @@ -52,8 +48,11 @@ import org.hisp.dhis.system.util.AttributeUtils; import org.hisp.dhis.user.UserGroupService; -import com.google.common.collect.Lists; -import com.opensymphony.xwork2.Action; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static org.hisp.dhis.commons.util.TextUtils.equalsNullSafe; /** * @author Kristian @@ -301,12 +300,12 @@ } private boolean mobile; - + public void setMobile( boolean mobile ) { this.mobile = mobile; } - + // ------------------------------------------------------------------------- // Action // ------------------------------------------------------------------------- @@ -338,13 +337,13 @@ dataSet.setExpiryDays( expiryDays ); dataSet.setTimelyDays( timelyDays ); - if ( !( equalsNullSafe( name, dataSet.getName() ) && + if ( !(equalsNullSafe( name, dataSet.getName() ) && periodType.equals( dataSet.getPeriodType() ) && expiryDays == dataSet.getExpiryDays() && openFuturePeriods == dataSet.getOpenFuturePeriods() && dataElements.equals( dataSet.getDataElements() ) && indicators.equals( dataSet.getIndicators() ) && - renderAsTabs == dataSet.isRenderAsTabs() ) ) + renderAsTabs == dataSet.isRenderAsTabs()) ) { dataSet.increaseVersion(); // Check if version must be updated } @@ -377,8 +376,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( dataSet.getAttributeValues(), jsonAttributeValues, - attributeService ); + AttributeUtils.updateAttributeValuesFromJson( dataSet, dataSet.getAttributeValues(), jsonAttributeValues, attributeService ); } dataSetService.updateDataSet( dataSet ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2015-09-17 04:29:29 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2015-11-18 06:20:27 +0000 @@ -28,10 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Collection; -import java.util.HashSet; -import java.util.List; - +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.calendar.CalendarService; @@ -47,7 +44,9 @@ import org.hisp.dhis.system.util.ValidationUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.opensymphony.xwork2.Action; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; /** * @author Torgeir Lorange Ostby @@ -248,7 +247,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( organisationUnit.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( organisationUnit, organisationUnit.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java 2015-09-17 04:29:29 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java 2015-11-18 06:20:27 +0000 @@ -262,7 +262,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( organisationUnit.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( organisationUnit, organisationUnit.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java 2015-03-31 07:59:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java 2015-11-18 06:20:27 +0000 @@ -28,9 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Collection; -import java.util.List; - +import com.opensymphony.xwork2.ActionSupport; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.organisationunit.OrganisationUnit; @@ -39,7 +37,8 @@ import org.hisp.dhis.oust.manager.SelectionTreeManager; import org.hisp.dhis.system.util.AttributeUtils; -import com.opensymphony.xwork2.ActionSupport; +import java.util.Collection; +import java.util.List; /** * @author Torgeir Lorange Ostby @@ -139,7 +138,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( organisationUnitGroup.getAttributeValues(), + AttributeUtils.updateAttributeValuesFromJson( organisationUnitGroup, organisationUnitGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/UpdateOrganisationUnitGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/UpdateOrganisationUnitGroupAction.java 2015-03-31 07:59:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/UpdateOrganisationUnitGroupAction.java 2015-11-18 06:20:27 +0000 @@ -143,7 +143,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( organisationUnitGroup.getAttributeValues(), + AttributeUtils.updateAttributeValuesFromJson( organisationUnitGroup, organisationUnitGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java 2015-03-31 07:59:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java 2015-11-18 06:20:27 +0000 @@ -28,11 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; @@ -40,7 +36,10 @@ import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet; import org.hisp.dhis.system.util.AttributeUtils; -import com.opensymphony.xwork2.Action; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Lars Helge Overland @@ -91,7 +90,7 @@ { this.code = code; } - + private boolean compulsory; public void setCompulsory( boolean compulsory ) @@ -129,13 +128,13 @@ throws Exception { OrganisationUnitGroupSet groupSet = new OrganisationUnitGroupSet(); - + groupSet.setName( StringUtils.trimToNull( name ) ); groupSet.setCode( StringUtils.trimToNull( code ) ); groupSet.setDescription( StringUtils.trimToNull( description ) ); groupSet.setCompulsory( compulsory ); groupSet.setDataDimension( dataDimension ); - + Set selectedMembers = new HashSet<>(); if ( ougSelected != null ) @@ -148,8 +147,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( groupSet.getAttributeValues(), - jsonAttributeValues, attributeService ); + AttributeUtils.updateAttributeValuesFromJson( groupSet, groupSet.getAttributeValues(), jsonAttributeValues, attributeService ); } groupSet.setOrganisationUnitGroups( selectedMembers ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java 2015-03-31 07:59:24 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java 2015-11-18 06:20:27 +0000 @@ -156,7 +156,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( organisationUnitGroupSet.getAttributeValues(), + AttributeUtils.updateAttributeValuesFromJson( organisationUnitGroupSet, organisationUnitGroupSet.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java 2015-11-16 22:52:04 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java 2015-11-18 06:20:27 +0000 @@ -340,7 +340,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( program.getAttributeValues(), jsonAttributeValues, attributeService ); + AttributeUtils.updateAttributeValuesFromJson( program, program.getAttributeValues(), jsonAttributeValues, attributeService ); } programService.updateProgram( program ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java 2015-11-16 22:52:04 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java 2015-11-18 06:20:27 +0000 @@ -367,7 +367,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( program.getAttributeValues(), jsonAttributeValues, attributeService ); + AttributeUtils.updateAttributeValuesFromJson( program, program.getAttributeValues(), jsonAttributeValues, attributeService ); } if ( categoryComboId != null ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java 2015-10-23 03:41:44 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java 2015-11-18 06:20:27 +0000 @@ -28,11 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.dataelement.DataElement; @@ -51,7 +47,10 @@ import org.hisp.dhis.user.UserGroupService; import org.springframework.beans.factory.annotation.Autowired; -import com.opensymphony.xwork2.Action; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Abyot Asalefew Gizaw @@ -439,7 +438,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( programStage.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( programStage, programStage.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java 2015-10-23 03:41:44 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java 2015-11-18 06:20:27 +0000 @@ -428,7 +428,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( programStage.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( programStage, programStage.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/AddTrackedEntityAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/AddTrackedEntityAction.java 2015-09-23 12:27:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/AddTrackedEntityAction.java 2015-11-18 06:20:27 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.system.util.AttributeUtils; @@ -35,13 +36,10 @@ import org.hisp.dhis.trackedentity.TrackedEntityService; import org.springframework.beans.factory.annotation.Autowired; -import com.opensymphony.xwork2.Action; - import java.util.List; /** * @author Chau Thu Tran - * * @version $ AddTrackedEntityAction.java Feb 15, 2014 7:20:44 PM $ */ public class AddTrackedEntityAction @@ -96,7 +94,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( trackedEntity.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( trackedEntity, trackedEntity.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/UpdateTrackedEntityAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/UpdateTrackedEntityAction.java 2015-09-23 12:27:33 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/UpdateTrackedEntityAction.java 2015-11-18 06:20:27 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.system.util.AttributeUtils; @@ -35,13 +36,10 @@ import org.hisp.dhis.trackedentity.TrackedEntityService; import org.springframework.beans.factory.annotation.Autowired; -import com.opensymphony.xwork2.Action; - import java.util.List; /** * @author Chau Thu Tran - * * @version $ UpdateTrackedEntityAction.java Feb 15, 2014 7:20:44 PM $ */ public class UpdateTrackedEntityAction @@ -50,7 +48,7 @@ // ------------------------------------------------------------------------- // Dependency // ------------------------------------------------------------------------- - + @Autowired private TrackedEntityService trackedEntityService; @@ -101,10 +99,10 @@ trackedEntity.setName( StringUtils.trimToNull( name ) ); trackedEntity.setDescription( StringUtils.trimToNull( description ) ); - + if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( trackedEntity.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( trackedEntity, trackedEntity.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/AddAttributeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/AddAttributeAction.java 2015-10-19 19:21:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/AddAttributeAction.java 2015-11-18 06:20:27 +0000 @@ -1,8 +1,6 @@ package org.hisp.dhis.trackedentity.action.trackedentityattribute; -import java.util.List; -import java.util.Objects; - +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.analytics.AggregationType; import org.hisp.dhis.attribute.AttributeService; @@ -16,6 +14,9 @@ import org.hisp.dhis.trackedentity.TrackedEntityService; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import java.util.Objects; + /* * Copyright (c) 2004-2015, University of Oslo * All rights reserved. @@ -44,8 +45,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.opensymphony.xwork2.Action; - /** * @author Abyot Asalefew Gizaw * @version $Id$ @@ -200,9 +199,9 @@ throws Exception { OptionSet optionSet = optionService.getOptionSet( optionSetId ); - + valueType = optionSet != null && optionSet.getValueType() != null ? optionSet.getValueType() : valueType; - + TrackedEntityAttribute trackedEntityAttribute = new TrackedEntityAttribute(); trackedEntityAttribute.setName( StringUtils.trimToNull( name ) ); @@ -254,7 +253,8 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( trackedEntityAttribute.getAttributeValues(), jsonAttributeValues, attributeService ); + AttributeUtils.updateAttributeValuesFromJson( trackedEntityAttribute, trackedEntityAttribute.getAttributeValues(), + jsonAttributeValues, attributeService ); } trackedEntityAttributeService.addTrackedEntityAttribute( trackedEntityAttribute ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/UpdateAttributeAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/UpdateAttributeAction.java 2015-10-19 19:21:51 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/UpdateAttributeAction.java 2015-11-18 06:20:27 +0000 @@ -208,7 +208,7 @@ OptionSet optionSet = optionService.getOptionSet( optionSetId ); valueType = optionSet != null && optionSet.getValueType() != null ? optionSet.getValueType() : valueType; - + TrackedEntityAttribute trackedEntityAttribute = trackedEntityAttributeService.getTrackedEntityAttribute( id ); trackedEntityAttribute.setName( StringUtils.trimToNull( name ) ); @@ -260,7 +260,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( trackedEntityAttribute.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( trackedEntityAttribute, trackedEntityAttribute.getAttributeValues(), jsonAttributeValues, attributeService ); } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddUserAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddUserAction.java 2015-11-08 13:56:42 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddUserAction.java 2015-11-18 06:20:27 +0000 @@ -28,11 +28,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import com.google.common.collect.Lists; +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.ServletActionContext; import org.hisp.dhis.attribute.AttributeService; @@ -59,8 +56,10 @@ import org.hisp.dhis.webapi.utils.ContextUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.google.common.collect.Lists; -import com.opensymphony.xwork2.Action; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Torgeir Lorange Ostby @@ -114,7 +113,7 @@ @Autowired private CurrentUserService currentUserService; - + @Autowired private UserSettingService userSettingService; @@ -148,7 +147,7 @@ { this.inviteUsername = inviteUsername; } - + private boolean externalAuth; public void setExternalAuth( boolean externalAuth ) @@ -190,7 +189,7 @@ { this.openId = openId; } - + private String ldapId; public void setLdapId( String ldapId ) @@ -306,7 +305,7 @@ userCredentials.setExternalAuth( externalAuth ); userCredentials.setOpenId( StringUtils.trimToNull( openId ) ); userCredentials.setLdapId( StringUtils.trimToNull( ldapId ) ); - + if ( ACCOUNT_ACTION_INVITE.equals( accountAction ) ) { userCredentials.setUsername( StringUtils.trimToNull( inviteUsername ) ); @@ -327,7 +326,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( user.getAttributeValues(), jsonAttributeValues, attributeService ); + AttributeUtils.updateAttributeValuesFromJson( user, user.getAttributeValues(), jsonAttributeValues, attributeService ); } // --------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java 2015-11-08 16:46:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java 2015-11-18 06:20:27 +0000 @@ -28,11 +28,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import com.google.common.collect.Lists; +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.common.IdentifiableObjectManager; @@ -54,8 +51,10 @@ import org.hisp.dhis.user.UserSettingService; import org.springframework.beans.factory.annotation.Autowired; -import com.google.common.collect.Lists; -import com.opensymphony.xwork2.Action; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Torgeir Lorange Ostby @@ -267,7 +266,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( user.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( user, user.getAttributeValues(), jsonAttributeValues, attributeService ); } @@ -335,7 +334,7 @@ // --------------------------------------------------------------------- userService.encodeAndSetPassword( userCredentials, rawPassword ); - + userService.updateUserCredentials( userCredentials ); userService.updateUser( user ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/AddUserGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/AddUserGroupAction.java 2015-03-11 11:01:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/AddUserGroupAction.java 2015-11-18 06:20:27 +0000 @@ -28,10 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.system.util.AttributeUtils; @@ -39,7 +36,9 @@ import org.hisp.dhis.user.UserGroupService; import org.hisp.dhis.user.UserService; -import com.opensymphony.xwork2.Action; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public class AddUserGroupAction implements Action @@ -118,7 +117,7 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( userGroup.getAttributeValues(), jsonAttributeValues, + AttributeUtils.updateAttributeValuesFromJson( userGroup, userGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } @@ -126,7 +125,7 @@ { userGroup.addManagedGroup( userGroupService.getUserGroup( uid ) ); } - + userGroupService.addUserGroup( userGroup ); return SUCCESS; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/UpdateUserGroupAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/UpdateUserGroupAction.java 2015-03-11 11:01:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/UpdateUserGroupAction.java 2015-11-18 06:20:27 +0000 @@ -28,10 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.HashSet; -import java.util.List; -import java.util.Set; - +import com.opensymphony.xwork2.Action; import org.apache.commons.lang3.StringUtils; import org.hisp.dhis.attribute.AttributeService; import org.hisp.dhis.system.util.AttributeUtils; @@ -40,7 +37,9 @@ import org.hisp.dhis.user.UserGroupService; import org.hisp.dhis.user.UserService; -import com.opensymphony.xwork2.Action; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public class UpdateUserGroupAction implements Action @@ -97,14 +96,14 @@ { this.jsonAttributeValues = jsonAttributeValues; } - + private Set userGroupsSelected = new HashSet<>(); public void setUserGroupsSelected( Set userGroupsSelected ) { this.userGroupsSelected = userGroupsSelected; } - + // ------------------------------------------------------------------------- // Action Implementation // ------------------------------------------------------------------------- @@ -114,7 +113,7 @@ throws Exception { //TODO managed groups access control - + UserGroup userGroup = userGroupService.getUserGroup( userGroupId ); Set users = new HashSet<>(); @@ -129,18 +128,18 @@ if ( jsonAttributeValues != null ) { - AttributeUtils.updateAttributeValuesFromJson( userGroup.getAttributeValues(), jsonAttributeValues, attributeService ); + AttributeUtils.updateAttributeValuesFromJson( userGroup, userGroup.getAttributeValues(), jsonAttributeValues, attributeService ); } - + Set managedGroups = new HashSet<>(); - + for ( String uid : userGroupsSelected ) { managedGroups.add( userGroupService.getUserGroup( uid ) ); } - + userGroup.updateManagedGroups( managedGroups ); - + userGroupService.updateUserGroup( userGroup ); return SUCCESS;