Skip to content

Commit

Permalink
Merge branch 'feature/1224-jednostka-raport-zerowy' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mpasternak committed Jun 14, 2022
2 parents 5b8324b + acef25d commit 5ccef87
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dev
poleceń -- polecenie ``pbn_show_json`` (b/n),
* poprawnie wysyłaj strony do PBN API (#1176),
* podgląd edycji schematu opisu bibliograficznego (#898),
* informacja o aktualnej jednostce w raportach "zerowych" (#1224)

202205.1086
-----------
Expand Down
4 changes: 3 additions & 1 deletion src/raport_slotow/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ class RaportZerowyFilter(django_filters.FilterSet):
widget=NumberInput(attrs={"placeholder": "max"}),
)
dyscyplina_naukowa = django_filters.ModelChoiceFilter(
queryset=Dyscyplina_Naukowa.objects.all()
queryset=Dyscyplina_Naukowa.objects.filter(
pk__in=Autorzy.objects.values("dyscyplina_naukowa_id").distinct()
)
)


Expand Down
1 change: 1 addition & 0 deletions src/raport_slotow/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ class Meta:
model = RaportZerowyEntry
fields = (
"autor",
"autor__aktualna_jednostka",
"autor__pbn_id",
"autor__orcid",
"lata",
Expand Down

0 comments on commit 5ccef87

Please sign in to comment.