------------------------------------------------------------
revno: 17815
committer: [email protected]
branch nick: dhis2
timestamp: Sun 2014-12-28 18:40:22 -0500
message:
Approvals: if dataelementcategoryoption.publicaccess is null in DB, that
means public read is allowed.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.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-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2014-11-26 15:21:02 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java 2014-12-28 23:40:22 +0000
@@ -367,7 +367,8 @@
"left join usergroupaccess uga on uga.usergroupaccessid = couga.usergroupaccessid " +
"left join usergroupmembers ugm on ugm.usergroupid = uga.usergroupid " +
"where ( coo.categoryoptionid is null or ous.organisationunitid is not null " + testAncestors + ") " +
- ( isSuperUser || user == null ? "" : "and ( ugm.userid = " + user.getId() + " or co.userid = " + user.getId() + " or left(co.publicaccess, 1) = 'r' ) " ) +
+ ( isSuperUser || user == null ? "" : "and ( ugm.userid = " + user.getId() + " or co.userid = " + user.getId() +
+ "or co.publicaccess is null or left(co.publicaccess, 1) = 'r' ) " ) +
( attributeOptionCombo == null ? "" : "and cocco.categoryoptioncomboid = " + attributeOptionCombo.getId() + " " ) +
") as a";
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
