From 926fa7116fd633b69277c3ad9b3370ca45163231 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Tue, 27 Nov 2018 10:57:26 -0500 Subject: [PATCH] Fixed #29317 -- Doc'd filter argument in contrib.postgres aggregates. --- docs/ref/contrib/postgres/aggregates.txt | 5 +++++ docs/ref/models/querysets.txt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt index a605bc831c..fce85d0ade 100644 --- a/docs/ref/contrib/postgres/aggregates.txt +++ b/docs/ref/contrib/postgres/aggregates.txt @@ -16,6 +16,11 @@ These functions are described in more detail in the `PostgreSQL docs >>> SomeModel.objects.aggregate(arr=ArrayAgg('somefield')) {'arr': [0, 1, 2]} +.. admonition:: Common aggregate options + + All aggregates have the :ref:`filter ` keyword + argument. + General-purpose aggregation functions ===================================== diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 6492ba8685..2f32382e1f 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -3315,6 +3315,8 @@ of the return value ``output_field`` if all fields are of the same type. Otherwise, you must provide the ``output_field`` yourself. +.. _aggregate-filter: + ``filter`` ~~~~~~~~~~