dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16257
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-07-27 16:56:46 +0200
message:
  Detailed meta export, show details function, was not working at all
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2FilteredMetaDataExport.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.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-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2FilteredMetaDataExport.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2FilteredMetaDataExport.vm	2014-01-03 18:34:17 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2FilteredMetaDataExport.vm	2014-07-27 14:56:46 +0000
@@ -63,7 +63,7 @@
                         <a href="javascript:hideDetails();" title="$i18n.getString( 'hide_details' )"><img src="../images/hide.png" alt="$i18n.getString( 'hide_details' )"/></a>
                     </div>
                     <p><label>$i18n.getString( "name" ):</label><br/><span id="nameField"></span></p>
-                    <p><label>$i18n.getString( "description" ):</label><br/><span id="descriptionField"></span></p>
+                    <p><label>$i18n.getString( "id" ):</label><br/><span id="idField"></span></p>
                 </div>
             </td>
         </tr>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js	2014-01-03 18:34:17 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js	2014-07-27 14:56:46 +0000
@@ -47,17 +47,11 @@
 // Show Filter details
 function showFilterDetails( context )
 {
-	var filterUid = context.uid;
-	
-    $( "#detailsArea" ).show( "fast" );
-    for ( var i = 0; i < filters.length; i++ )
-    {
-        if ( filters[i].id == filterUid )
-        {
-            setInnerHTML( 'nameField', filters[i].name );
-            setInnerHTML( 'descriptionField', filters[i].description );
-        }
-    }
+	var filter = $.getJSON( "../api/metaDataFilters/" + context.uid, function( json ) {
+		setInnerHTML( 'nameField', json.name );
+		setInnerHTML( 'idField', json.id );
+		showDetails();
+	} );
 }
 
 // -----------------------------------------------------------------------------