ソースを参照

HUE-1864 [beeswax] download CSV doesn't work if design was never saved

Abraham Elmahrek 12 年 前
コミット
49b6238

+ 2 - 2
apps/beeswax/src/beeswax/templates/execute.mako

@@ -264,10 +264,10 @@ ${layout.menubar(section='query')}
       <a id="save-results" data-bind="click: saveResultsModal" href="javascript:void(0)" title="${_('Save the results to HDFS or a new Hive table')}" rel="tooltip"
         class="view-query-results hide pull-right"><h4 style="margin-right: 20px"><i class="fa fa-save"></i></h4></a>
 
-      <a id="download-csv" data-bind="attr: {'href': '/beeswax/download/' + $root.design.id() + '/csv'}" href="javascript:void(0)" title="${_('Download the results in CSV format')}" rel="tooltip"
+      <a id="download-csv" data-bind="attr: {'href': '/beeswax/download/' + $root.design.history.id() + '/csv'}" href="javascript:void(0)" title="${_('Download the results in CSV format')}" rel="tooltip"
         class="view-query-results hide pull-right"><h4 style="margin-right: 20px"><i class="fa fa-arrow-circle-o-down"></i></h4></a>
 
-      <a id="download-excel" data-bind="attr: {'href': '/beeswax/download/' + $root.design.id() + '/xls'}" href="javascript:void(0)" title="${_('Download the results for excel')}" rel="tooltip"
+      <a id="download-excel" data-bind="attr: {'href': '/beeswax/download/' + $root.design.history.id() + '/xls'}" href="javascript:void(0)" title="${_('Download the results for excel')}" rel="tooltip"
         class="view-query-results hide pull-right"><h4 style="margin-right: 20px"><i class="fa fa-arrow-circle-o-down"></i></h4></a>
    </div>
 

+ 2 - 1
apps/beeswax/static/js/beeswax.vm.js

@@ -414,6 +414,7 @@ function BeeswaxViewModel(server) {
           self.design.results.url('/' + self.server() + '/results/' + data.id + '/0?format=json');
           self.design.watch.url(data.watch_url);
           self.design.statement(data.statement);
+          self.design.history.id(data.id);
           self.watchQueryLoop();
         } else {
           self.design.errors.push(data.message);
@@ -651,7 +652,7 @@ function BeeswaxViewModel(server) {
         'type': self.design.results.save.type(),
         'path': self.design.results.save.path()
       };
-      var url = '/' + self.server() + '/api/query/' + self.design.id() + '/results/save';
+      var url = '/' + self.server() + '/api/query/' + self.design.history.id() + '/results/save';
       var request = {
         url: url,
         dataType: 'json',