------------------------------------------------------------
revno: 21922
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Wed 2016-02-10 13:38:20 +0700
message:
partial revert of R 21921
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIdentifiableObjects.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.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-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIdentifiableObjects.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIdentifiableObjects.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIdentifiableObjects.vm 2016-02-10 06:38:20 +0000
@@ -1,6 +1,6 @@
#set( $size = $objectMap.size() )
{ "objects": [
-#foreach( $object in $objectMap )
+#foreach( $object in $objects )
{
"id": "$!{object.id}",
"uid": "$!{object.uid}",
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2016-02-10 06:38:20 +0000
@@ -504,7 +504,7 @@
</td>
<td>
<select id="${args.prefix}Selected" name="${args.prefix}Selected" multiple="multiple" style="height: 200px; width: 100%;">
- #foreach ( $object in $args.objectMap )
+ #foreach ( $object in $args.objects )
<option value="$object.uid">$encoder.htmlEncode( $object.displayName )</option>
#end
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm 2016-02-10 06:38:20 +0000
@@ -192,7 +192,7 @@
<tr>
<td colspan="2">
<select multiple id="existingObjects" name="existingObjects" style="width:100%; height:220px">
- #foreach( $object in $objectMap )
+ #foreach( $object in $objects )
<option value="$object.id">$object.name</option>
#end
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm 2016-02-10 06:38:20 +0000
@@ -73,7 +73,7 @@
<td colspan="4" style="height:10px"></td>
</tr>
<tr>
- <th colspan="4">$i18n.getString( "objectMap" )</th>
+ <th colspan="4">$i18n.getString( "objects" )</th>
</tr>
<tr>
<td colspan="4">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm 2016-02-10 06:38:20 +0000
@@ -6,79 +6,79 @@
</tr>
<tr>
<td>$i18n.getString( "data_elements" )</td>
- <td>$objectMap.getValue( "DATAELEMENT" )</td>
+ <td>$objects.getValue( "DATAELEMENT" )</td>
</tr>
<tr>
<td>$i18n.getString( "data_element_groups" )</td>
- <td>$objectMap.getValue( "DATAELEMENTGROUP" )</td>
+ <td>$objects.getValue( "DATAELEMENTGROUP" )</td>
</tr>
<tr>
<td>$i18n.getString( "indicator_types" )</td>
- <td>$objectMap.getValue( "INDICATORTYPE" )</td>
+ <td>$objects.getValue( "INDICATORTYPE" )</td>
</tr>
<tr>
<td>$i18n.getString( "indicators" )</td>
- <td>$objectMap.getValue( "INDICATOR" )</td>
+ <td>$objects.getValue( "INDICATOR" )</td>
</tr>
<tr>
<td>$i18n.getString( "indicator_groups" )</td>
- <td>$objectMap.getValue( "INDICATORGROUP" )</td>
+ <td>$objects.getValue( "INDICATORGROUP" )</td>
</tr>
<tr>
<td>$i18n.getString( "data_sets" )</td>
- <td>$objectMap.getValue( "DATASET" )</td>
+ <td>$objects.getValue( "DATASET" )</td>
</tr>
<tr>
<td>$i18n.getString( "organisation_units" )</td>
- <td>$objectMap.getValue( "ORGANISATIONUNIT" )</td>
+ <td>$objects.getValue( "ORGANISATIONUNIT" )</td>
</tr>
<tr>
<td>$i18n.getString( "organisation_unit_groups" )</td>
- <td>$objectMap.getValue( "ORGANISATIONUNITGROUP" )</td>
+ <td>$objects.getValue( "ORGANISATIONUNITGROUP" )</td>
</tr>
<tr>
<td>$i18n.getString( "validation_rules" )</td>
- <td>$objectMap.getValue( "VALIDATIONRULE" )</td>
+ <td>$objects.getValue( "VALIDATIONRULE" )</td>
</tr>
<tr>
<td>$i18n.getString( "periods" )</td>
- <td>$objectMap.getValue( "PERIOD" )</td>
+ <td>$objects.getValue( "PERIOD" )</td>
</tr>
<tr>
<td>$i18n.getString( "users" )</td>
- <td>$objectMap.getValue( "USER" )</td>
+ <td>$objects.getValue( "USER" )</td>
</tr>
<tr>
<td>$i18n.getString( "user_groups" )</td>
- <td>$objectMap.getValue( "USERGROUP" )</td>
+ <td>$objects.getValue( "USERGROUP" )</td>
</tr>
<tr>
<td>$i18n.getString( "pivot_tables" )</td>
- <td>$objectMap.getValue( "REPORTTABLE" )</td>
+ <td>$objects.getValue( "REPORTTABLE" )</td>
</tr>
<tr>
<td>$i18n.getString( "charts" )</td>
- <td>$objectMap.getValue( "CHART" )</td>
+ <td>$objects.getValue( "CHART" )</td>
</tr>
<tr>
<td>$i18n.getString( "maps" )</td>
- <td>$objectMap.getValue( "MAP" )</td>
+ <td>$objects.getValue( "MAP" )</td>
</tr>
<tr>
<td>$i18n.getString( "dashboards" )</td>
- <td>$objectMap.getValue( "DASHBOARD" )</td>
+ <td>$objects.getValue( "DASHBOARD" )</td>
</tr>
<tr>
<td>$i18n.getString( "data_values" )</td>
- <td>$objectMap.getValue( "DATAVALUE" )</td>
+ <td>$objects.getValue( "DATAVALUE" )</td>
</tr>
<tr>
<td>$i18n.getString( "programs" )</td>
- <td>$objectMap.getValue( "PROGRAM" )</td>
+ <td>$objects.getValue( "PROGRAM" )</td>
</tr>
<tr>
<td>$i18n.getString( "events" )</td>
- <td>$objectMap.getValue( "PROGRAMSTAGEINSTANCE" )</td>
+ <td>$objects.getValue( "PROGRAMSTAGEINSTANCE" )</td>
</tr>
<tr>
<td colspan="2" style="height:15px"></td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm 2016-02-10 06:38:20 +0000
@@ -242,14 +242,14 @@
"prefix": "de",
"i18n_available": "available_data_elements",
"i18n_selected": "selected_data_elements",
- "objectMap": $dataElements
+ "objects": $dataElements
})
#jqSelected({
"prefix": "in",
"i18n_available": "available_indicators",
"i18n_selected": "selected_indicators",
- "objectMap": $indicators
+ "objects": $indicators
})
<table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm 2016-02-10 06:38:20 +0000
@@ -84,7 +84,7 @@
"prefix": "oug",
"i18n_available": "available_groups",
"i18n_selected": "selected_groups",
- "objectMap": $selectedGroups
+ "objects": $selectedGroups
})
<p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm 2016-02-10 06:38:20 +0000
@@ -28,7 +28,7 @@
"prefix": "tea",
"i18n_available": "availableAttribute",
"i18n_selected": "selectedAttribute",
- "objectMap": $attributeGroup.attributes
+ "objects": $attributeGroup.attributes
})
<table>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm 2016-02-10 06:38:20 +0000
@@ -177,7 +177,7 @@
"required": true,
"i18n_available": "available_roles",
"i18n_selected": "selected_roles",
- "objectMap": $userAuthorityGroups
+ "objects": $userAuthorityGroups
})
<table style="margin-bottom: 20px;">
@@ -205,14 +205,14 @@
"prefix": "ug",
"i18n_available": "available_user_groups",
"i18n_selected": "selected_user_groups",
- "objectMap": $userGroups
+ "objects": $userGroups
})
#jqSelected({
"prefix": "dc",
"i18n_available": "available_dimension_restrictions_for_data_analytics",
"i18n_selected": "selected_dimension_restrictions_for_data_analytics",
- "objectMap": $dimensionConstraints
+ "objects": $dimensionConstraints
})
<div id="showFewerOptions" style="margin-bottom: 20px;"><a href="javascript:showUserOptions()">$i18n.getString( "show_fewer_options" )</a></div>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm 2016-02-10 06:31:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm 2016-02-10 06:38:20 +0000
@@ -55,14 +55,14 @@
"prefix": "users",
"i18n_available": "available_users",
"i18n_selected": "group_members",
- "objectMap": $groupMembers
+ "objects": $groupMembers
})
#jqSelected({
"prefix": "userGroups",
"i18n_available": "available_managed_user_groups",
"i18n_selected": "managed_user_groups",
- "objectMap": $managedGroups
+ "objects": $managedGroups
})
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
