DHIS

Merge lp:~sis-ma/dhis2/SISMA-475 into lp:dhis2

  1. SISMA-475
  2. Merge into trunk
Proposed by Leandro Soares
Status: Merged
Merged at revision: 12496
Proposed branch: lp:~sis-ma/dhis2/SISMA-475
Merge into: lp:dhis2
Diff against target: 80 lines (+3/-20)
4 files modified
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java (+1/-1)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java (+2/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java (+0/-4)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java (+0/-15)
To merge this branch: bzr merge lp:~sis-ma/dhis2/SISMA-475
Reviewer Review Type Date Requested Status
DHIS 2 core developers Pending
Review via email: mp+189307@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java'
2--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2013-09-11 15:26:20 +0000
3+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2013-10-04 13:18:01 +0000
4@@ -161,7 +161,7 @@
5 description = userAuthorityGroup.getDescription() == null ? description : userAuthorityGroup.getDescription();
6
7 removeAllAuthorities();
8- authorities.addAll( authorities );
9+ authorities.addAll( ((UserAuthorityGroup) other).getAuthorities() );
10
11 removeAllDataSets();
12 dataSets.addAll( userAuthorityGroup.getDataSets() );
13
14=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java'
15--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java 2013-09-11 15:26:20 +0000
16+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java 2013-10-04 13:18:01 +0000
17@@ -39,6 +39,7 @@
18 import org.hisp.dhis.common.BaseIdentifiableObject;
19 import org.hisp.dhis.common.DxfNamespaces;
20 import org.hisp.dhis.common.IdentifiableObject;
21+import org.hisp.dhis.common.annotation.Scanned;
22 import org.hisp.dhis.common.view.DetailedView;
23 import org.hisp.dhis.common.view.ExportView;
24
25@@ -57,6 +58,7 @@
26 /**
27 * Set of related users
28 */
29+ @Scanned
30 private Set<User> members = new HashSet<User>();
31
32 /**
33
34=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java'
35--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java 2013-10-01 09:34:05 +0000
36+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java 2013-10-04 13:18:01 +0000
37@@ -172,10 +172,6 @@
38 exportClasses = new LinkedHashMap<Class<? extends IdentifiableObject>, String>( allExportClasses );
39 importClasses = new LinkedHashMap<Class<? extends IdentifiableObject>, String>( allExportClasses );
40
41- // for now, do not allow user/userGroup to be imported
42- //importClasses.remove( User.class );
43- importClasses.remove( UserGroup.class );
44-
45 // this is considered data, and is not available for meta-data export/import
46 exportClasses.remove( MessageConversation.class );
47 exportClasses.remove( Interpretation.class );
48
49=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
50--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2013-10-01 12:52:30 +0000
51+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2013-10-04 13:18:01 +0000
52@@ -476,14 +476,6 @@
53 */
54 protected boolean updateObject( User user, T object, T persistedObject )
55 {
56- if ( newOnly( object ) )
57- {
58- summaryType.getImportConflicts().add(
59- new ImportConflict( ImportUtils.getDisplayName( object ), "This object type only allows creation of new objects." ) );
60-
61- return false;
62- }
63-
64 if ( !SharingUtils.canUpdate( user, persistedObject ) )
65 {
66 summaryType.getImportConflicts().add(
67@@ -608,13 +600,6 @@
68 //-------------------------------------------------------------------------------------------------------
69 // Helpers
70 //-------------------------------------------------------------------------------------------------------
71-
72- // until we have proper update of UserGroup/UserAuthorityGroup, only allow new instances to be created
73- private boolean newOnly( T object )
74- {
75- return UserGroup.class.isInstance( object ) || UserAuthorityGroup.class.isInstance( object );
76- }
77-
78 private void importObjectLocal( User user, T object )
79 {
80 if ( validateIdentifiableObject( object ) )