Reverts misplaced changes and adds fetching indicators from data source

app/controllers/api/v1/data_portal_downloads_controller.rb

@@ -21,7 +21,7 @@ def download_params
         {area_ids: []},
         {years: []},
         {units: []},
-        {indicator_ids: []},
+        {widget_ids: []},
         {thresholds: []},
         :json,
         :pivot

app/controllers/api/v1/downloads_controller.rb

@@ -10,7 +10,7 @@ def index
 
     def download_params
       params.permit(:iso, :id_1, :area, :start_year, :end_year,
-                    units: [], widget_ids: [], thresholds: [])
+                    units: [], indicator_ids: [], thresholds: [])
     end
   end
 end

app/models/data_portal_download.rb

@@ -4,7 +4,13 @@ def initialize options
     @jurisdiction_ids = options[:jurisdiction_ids] || []
     @area_ids = options[:area_ids] || []
     @years = options[:years] || []
-    @indicator_ids = options[:indicator_ids] || []
+    @indicator_ids = if options[:widget_ids]
+                       options[:widget_ids].map do |widget_id|
+                         Widget.find(widget_id).indicators.map{ |i| i["id"] }
+                       end.flatten
+                     else
+                       []
+                     end
     @thresholds = options[:thresholds] || []
     @json = options[:json]
     @pivot = options[:pivot]

app/models/download.rb

@@ -18,9 +18,7 @@ def initialize options
     @start_year = options[:start_year]
     @end_year = options[:end_year]
     @units = options[:units]
-    @indicator_ids = options[:widget_ids].map do |widget_id|
-      Widget.find(widget_id).indicators.map{ |i| i["id"] }
-    end.flatten
+    @indicator_ids = options[:indicator_ids]
     @thresholds = options[:thresholds]
   end