Merge pull request #27 from dpc-sdp/SXDEDPCXZIC-424

SXDEDPCXZIC-424 / CKAN 2.11 upgrade

Author: joelwigley

ckanext/datavic_reporting/helpers.py

@@ -485,7 +485,7 @@ def download_file(directory, filename):
         filename,
         mimetype="text/csv",
         as_attachment=True,
-        attachment_filename=filename,
+        download_name=filename,
     )
 
 

ckanext/datavic_reporting/model/base.py

@@ -2,16 +2,17 @@
 
 import datetime
 
+from sqlalchemy import Column, types
+
 import ckan.model as model
+import ckan.plugins.toolkit as tk
 from ckan.model.types import make_uuid
-from sqlalchemy import Column, types
 
-from .base import Base
 
 log = __import__("logging").getLogger(__name__)
 
 
-class ReportSchedule(Base):
+class ReportSchedule(tk.BaseModel):
     __tablename__ = "report_schedule"
 
     id = Column(types.UnicodeText, primary_key=True, default=make_uuid)
@@ -48,7 +49,7 @@ def as_dict(self):
         }
 
 
-class ReportJob(Base):
+class ReportJob(tk.BaseModel):
     __tablename__ = "report_job"
 
     id = Column(types.UnicodeText, primary_key=True, default=make_uuid)