------------------------------------------------------------ revno: 6241 committer: Lars Helge Overland <larshe...@gmail.com> branch nick: dhis2 timestamp: Sat 2012-03-10 11:09:51 +0100 message: Loading documents from web api in reports, dashboard and light module modified: dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_documents.vm dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.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/webapp/dhis-web-dashboard-integration/document.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm 2012-03-05 10:43:47 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm 2012-03-10 10:09:51 +0000 @@ -7,9 +7,9 @@ <tr> <td> #if ( $document.external ) - <a href="$document.url"> + <a href="${document.url}"> #else - <a href="javascript:window.location.href='../dhis-web-commons-stream/loadDocument.action?id=$document.id'"> + <a href="../api/documents/${document.uid}/data"> #end $document.name</a> </td> === modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_documents.vm' --- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_documents.vm 2011-10-13 14:29:49 +0000 +++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_documents.vm 2012-03-10 10:09:51 +0000 @@ -5,7 +5,7 @@ #if( $doc.external ) #set( $link = $doc.url ) #else -#set( $link = "../dhis-web-commons-stream/loadDocument.action?id=${doc.id}" ) +#set( $link = "../api/documents/${doc.uid}/data" ) #end <div class="contentItemDiv" onclick="javascript:window.location.href='${link}'">$encoder.htmlEncode( $doc.name )</div> === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm 2012-03-06 07:43:30 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm 2012-03-10 10:09:51 +0000 @@ -39,7 +39,7 @@ #if ( $document.external ) <a href="${document.url}" title="$i18n.getString( 'view_report' )"> #else - <a href="../dhis-web-commons-stream/loadDocument.action?id=${document.id}" title="$i18n.getString( 'view_report' )"> + <a href="../api/documents/${document.uid}/data" title="$i18n.getString( 'view_report' )"> #end <img src="../images/start_process.png" alt="$i18n.getString( 'view_report' )"></a> <a href="displayAddDocumentForm.action?id=$!document.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( "edit" )"></a>
_______________________________________________ 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