1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d3cc9a975d0e/ Changeset: d3cc9a975d0e User: jgoecks Date: 2013-10-23 18:22:43 Summary: Use galaxy_config.root for history URLs to support URL rewriting. Affected #: 2 files diff -r 5d138db3d1e52e364fd3c69c321ea44bac8373eb -r d3cc9a975d0e9aa1a91fc19ef33c5d3fa53d19fd static/scripts/mvc/history/history-model.js --- a/static/scripts/mvc/history/history-model.js +++ b/static/scripts/mvc/history/history-model.js @@ -207,7 +207,7 @@ function getHistory( id ){ // get the history data //return jQuery.ajax( '/generate_json_error' ); - return jQuery.ajax( '/api/histories/' + historyId ); + return jQuery.ajax( galaxy_config.root + 'api/histories/' + historyId ); } function countHdasFromHistory( historyData ){ // get the number of hdas accrd. to the history @@ -225,7 +225,7 @@ hdaDetailIds = hdaDetailIds( historyData ); } var data = ( hdaDetailIds.length )?( { details : hdaDetailIds.join( ',' ) } ):( {} ); - return jQuery.ajax( '/api/histories/' + historyData.id + '/contents', { data: data }); + return jQuery.ajax( galaxy_config.root + 'api/histories/' + historyData.id + '/contents', { data: data }); //return jQuery.ajax( '/generate_json_error' ); } diff -r 5d138db3d1e52e364fd3c69c321ea44bac8373eb -r d3cc9a975d0e9aa1a91fc19ef33c5d3fa53d19fd static/scripts/mvc/history/history-panel.js --- a/static/scripts/mvc/history/history-panel.js +++ b/static/scripts/mvc/history/history-panel.js @@ -291,7 +291,7 @@ var panel = this, historyFn = function(){ // make this current and get history data with one call - return jQuery.post( '/api/histories/' + historyId + '/set_as_current' ); + return jQuery.post( galaxy_config.root + 'api/histories/' + historyId + '/set_as_current' ); }; return this.loadHistoryWithHDADetails( historyId, attributes, historyFn ) .then(function( historyData, hdaData ){ @@ -314,7 +314,7 @@ var panel = this, historyFn = function(){ // get history data from posting a new history (and setting it to current) - return jQuery.post( '/api/histories', { current: true }); + return jQuery.post( galaxy_config.root + 'api/histories', { current: true }); }; // id undefined bc there is no historyId yet - the server will provide // (no need for details - nothing expanded in new history) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.