------------------------------------------------------------
revno: 12832
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Wed 2013-10-30 13:20:19 +0100
message:
Fixed bug with send message to user on profile
modified:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/SendMessageAction.java
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm
--
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-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/SendMessageAction.java'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/SendMessageAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/SendMessageAction.java 2013-10-30 12:20:19 +0000
@@ -93,6 +93,13 @@
{
this.text = text;
}
+
+ private boolean ignoreTree;
+
+ public void setIgnoreTree( boolean ignoreTree )
+ {
+ this.ignoreTree = ignoreTree;
+ }
// -------------------------------------------------------------------------
// Action implementation
@@ -105,9 +112,12 @@
Set<User> users = new HashSet<User>();
- for ( OrganisationUnit unit : selectionTreeManager.getReloadedSelectedOrganisationUnits() )
+ if ( !ignoreTree )
{
- users.addAll( unit.getUsers() );
+ for ( OrganisationUnit unit : selectionTreeManager.getReloadedSelectedOrganisationUnits() )
+ {
+ users.addAll( unit.getUsers() );
+ }
}
String[] recipientsArray = recipients.split( "," );
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm 2013-07-22 13:25:35 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm 2013-10-30 12:20:19 +0000
@@ -46,6 +46,8 @@
#organisationUnitSelectionTree( true true false )
</td>
</tr>
+#else
+<input type="hidden" name="ignoreTree" value="true">
#end
<tr>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
