[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21267: the confidential property og TrackerEntityAttributes can no longer be changed trough WEB or API; ...

Merge authors:
  Stian Sandvold (stian-sandvold)

revision-diff.txt (4.3 KB)

···

------------------------------------------------------------
revno: 21267 [merge]
committer: Stian Sandvold <stian.sandvold@gmail.com>
branch nick: dhis2
timestamp: Wed 2015-12-02 15:03:46 +0100
message:
  the confidential property og TrackerEntityAttributes can no longer be changed trough WEB or API; Updated WEB to reflect changes and added tipText to vonfidential checkbox
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java
  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/webapp/dhis-web-maintenance-program/addAttributeForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm

--
lp:dhis2

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress