------------------------------------------------------------
revno: 12246
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Thu 2013-09-26 09:38:27 +0200
message:
proper fix for dashboard sharing access props (unless null, always display
access part of idObject)
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.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-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2013-09-25 12:30:15 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2013-09-26 07:38:27 +0000
@@ -309,7 +309,6 @@
}
@JsonProperty
- @JsonView( { SharingBasicView.class, SharingDetailedView.class, SharingExportView.class } )
@JacksonXmlProperty( localName = "access", namespace = DxfNamespaces.DXF_2_0 )
public Access getAccess()
{
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java 2013-09-25 14:33:15 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java 2013-09-26 07:38:27 +0000
@@ -147,7 +147,7 @@
postProcessEntity( entity, options, parameters );
model.addAttribute( "model", entity );
- model.addAttribute( "viewClass", options.getViewClass( "sharingDetailed" ) );
+ model.addAttribute( "viewClass", options.getViewClass( "detailed" ) );
return StringUtils.uncapitalize( getEntitySimpleName() );
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
