dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21704
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2016-01-13 15:24:11 +0700
message:
  minor fix, use displayName in exportDataValueForm data set list
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.selected.js
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js


--
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-api/src/main/java/org/hisp/dhis/schema/Schema.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java	2016-01-13 08:24:11 +0000
@@ -443,8 +443,8 @@
     {
         this.propertyMap = propertyMap;
     }
-    
-    @SuppressWarnings("rawtypes")
+
+    @SuppressWarnings( "rawtypes" )
     private Set<Class> references;
 
     @JsonProperty

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.selected.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.selected.js	2015-04-14 08:25:33 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.selected.js	2016-01-13 08:24:11 +0000
@@ -228,7 +228,7 @@
       };
 
       if( context.like !== undefined && context.like.length > 0 ) {
-        request.data.filter = 'name:like:' + context.like;
+        request.data.filter = 'displayName:like:' + context.like;
       }
 
       context.searchButton.find('i').removeClass('fa-search');

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm	2015-08-03 22:22:21 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm	2016-01-13 08:24:11 +0000
@@ -1,28 +1,28 @@
 <script type="text/javascript">
-	jQuery(document).ready(function() {
-		datePickerInRange( 'startDate' , 'endDate' );	
-
-        selectionTreeSelection.setMultipleSelectionAllowed( true );
-		selectionTree.clearSelectedOrganisationUnitsAndBuildTree();
-
-        jQuery("#availableDataSets").dhisAjaxSelect({
-			source: "../api/dataSets.json?links=false&paging=false",
-			iterator: "dataSets",
-			connectedTo: 'selectedDataSets',
-			handler: function(item) {
-				var option = jQuery("<option />");
-				option.text( item.name );
-				option.attr( "value", item.id );
-
-				return option;
-			}
-		});
-	});
-
-    var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
-    var i18n_select_startdate = '$encoder.jsEscape( $i18n.getString( "select_startdate" ), "'")';
-    var i18n_select_enddate = '$encoder.jsEscape( $i18n.getString( "select_enddate" ), "'")';
-    var i18n_select_datasets = '$encoder.jsEscape( $i18n.getString( "select_datasets" ), "'")';
+  jQuery(document).ready(function() {
+    datePickerInRange('startDate', 'endDate');
+
+    selectionTreeSelection.setMultipleSelectionAllowed(true);
+    selectionTree.clearSelectedOrganisationUnitsAndBuildTree();
+
+    jQuery("#availableDataSets").dhisAjaxSelect({
+      source: "../api/dataSets.json?links=false&paging=false",
+      iterator: "dataSets",
+      connectedTo: 'selectedDataSets',
+      handler: function(item) {
+        var option = jQuery("<option />");
+        option.text(item.displayName);
+        option.attr("value", item.id);
+
+        return option;
+      }
+    });
+  });
+
+  var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
+  var i18n_select_startdate = '$encoder.jsEscape( $i18n.getString( "select_startdate" ), "'")';
+  var i18n_select_enddate = '$encoder.jsEscape( $i18n.getString( "select_enddate" ), "'")';
+  var i18n_select_datasets = '$encoder.jsEscape( $i18n.getString( "select_datasets" ), "'")';
 </script>
 
 <h3>$i18n.getString( "data_export" ) #openHelp( "export" )</h3>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js	2015-06-30 21:58:15 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js	2016-01-13 08:24:11 +0000
@@ -197,7 +197,7 @@
         {
             var option = jQuery( "<option/>" );
             option.text( item.name );
-            option.attr( "name", item.name );
+            option.attr( "name", item.displayName );
             option.attr( "value", item.id );
 
             return option;