=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/glyphicons_003_user.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/glyphicons_003_user.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/glyphicons_003_user.png 2012-09-25 04:09:42 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/glyphicons_043_group.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/glyphicons_043_group.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/glyphicons_043_group.png 2012-09-25 04:09:42 +0000 differ
=== 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 2012-09-24 09:29:52 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm 2012-09-25 04:09:42 +0000
@@ -6,7 +6,23 @@
var i18n_enter_text = '$encoder.jsEscape( $i18n.getString( "enter_text" ), "'")';
var i18n_select_one_or_more_recipients = '$encoder.jsEscape( $i18n.getString( "select_one_or_more_recipients" ), "'")';
-$(function() {
+function format(item)
+{
+ if(item.id.indexOf('u:') != -1)
+ {
+ return '' + item.text;
+ }
+ else if (item.id.indexOf('ug:') != -1)
+ {
+ return '' + item.text;
+ }
+ else
+ {
+ return item.text;
+ }
+}
+
+jQuery(function() {
$('#additionalUsers').select2({
placeholder: 'Select user and user groups',
minimumInputLength: 2,
@@ -23,7 +39,9 @@
results: function(data, page) {
return { results: data.matches }
}
- }
+ },
+ formatResult: format,
+ formatSelection: format
});
});