From 080c4123f1c7aca70113f7e8aded403511756a52 Mon Sep 17 00:00:00 2001 From: Ramez Ashraf Date: Fri, 27 Jan 2023 21:35:39 +0200 Subject: [PATCH] Version bump --- CHANGELOG.md | 4 ++++ docs/source/conf.py | 2 +- slick_reporting/__init__.py | 4 ++-- slick_reporting/generator.py | 4 ---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd3e7ba..8c832b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## [0.6.5] +- Fix Issue with group_by field pointing to model with custom primary key Issue #58 + + ## [0.6.4] - Fix highchart cache to target the specific chart - Added initial and required to report_form_factory diff --git a/docs/source/conf.py b/docs/source/conf.py index f358cdd..3462e81 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -27,7 +27,7 @@ master_doc = 'index' # The full version, including alpha/beta/rc tags -release = '0.6.4' +release = '0.6.5' # -- General configuration --------------------------------------------------- diff --git a/slick_reporting/__init__.py b/slick_reporting/__init__.py index b012eb3..1c1030f 100644 --- a/slick_reporting/__init__.py +++ b/slick_reporting/__init__.py @@ -1,5 +1,5 @@ default_app_config = 'slick_reporting.apps.ReportAppConfig' -VERSION = (0, 6, 4) +VERSION = (0, 6, 5) -__version__ = '0.6.4' +__version__ = '0.6.5' diff --git a/slick_reporting/generator.py b/slick_reporting/generator.py index 77614f3..4c169b3 100644 --- a/slick_reporting/generator.py +++ b/slick_reporting/generator.py @@ -353,8 +353,6 @@ def _get_record_data(self, obj, columns): :return: a dict object containing all needed data """ - # todo , if columns are empty for whatever reason this will throw an error - # display_link = self.list_display_links or columns[0] data = {} group_by_val = None if self.group_by: @@ -389,8 +387,6 @@ def _get_record_data(self, obj, columns): else: data[name] = obj.get(name, '') - # if self.group_by and name in display_link: - # data[name] = make_linkable_field(self.group_by_field.related_model, group_by_val, data[name]) return data def get_report_data(self):