← Back to team overview

sts-sponsors team mailing list archive

Re: [Merge] ~ack/maas-site-manager:timezone-filter-fix into maas-site-manager:main

 


Diff comments:

> diff --git a/backend/msm/db/queries.py b/backend/msm/db/queries.py
> index 8a3bd32..c8369f9 100644
> --- a/backend/msm/db/queries.py
> +++ b/backend/msm/db/queries.py
> @@ -30,7 +33,7 @@ from ._tables import (
>  
>  def filters_from_arguments(
>      table: Table,
> -    **filter_args: list[str] | None,
> +    **filter_args: list[Any] | None,

not really, since the type depends on the field

>  ) -> list[ColumnOperators]:
>      """Return clauses to join with AND and all entries for a single arg by OR.
>      This enables to convert query params such as
> diff --git a/backend/msm/schema/_models.py b/backend/msm/schema/_models.py
> index 24a732d..6128eec 100644
> --- a/backend/msm/schema/_models.py
> +++ b/backend/msm/schema/_models.py
> @@ -37,11 +37,7 @@ class CreateSite(BaseModel):
>  
>      name: str
>      city: str | None
> -<<<<<<< backend/msm/schema/_models.py
>      country: str | None = Field(min_length=2, max_length=2)
> -=======

uhm, that's a launchpad artifact, I don't have it in my branch

> -    country: str | None
> ->>>>>>> backend/msm/schema/_models.py
>      latitude: str | None
>      longitude: str | None
>      note: str | None


-- 
https://code.launchpad.net/~ack/maas-site-manager/+git/site-manager/+merge/441168
Your team MAAS Committers is subscribed to branch ~ack/maas-site-manager:filters-group.



References