api: merge category selection into agenda options (#71187) #8

Closed

vdeniaud wants to merge 1 commits from wip/71187-statistiques-ranger-les-agendas- into main

vdeniaud commented

Owner

There is no content yet.

vdeniaud added 1 commit

gitea-wip/chrono/pipeline/pr-main There was a failure building this commit Details

0650f9c585 api: merge category selection into agenda options (#71187 )

vdeniaud force-pushed wip/71187-statistiques-ranger-les-agendas- from 0650f9c585 to e220f39954

fpeters reviewed

chrono/api/serializers.py

													
				@ -294,3 +294,3 @@

				    end = serializers.DateTimeField(required=False, input_formats=['iso-8601', '%Y-%m-%d'])

				    category = serializers.SlugField(required=False, allow_blank=False, max_length=256)

				    agenda = serializers.SlugField(required=False, allow_blank=False, max_length=256)

				    agenda = serializers.CharField(required=False, allow_blank=False, max_length=256)

fpeters commented

Owner

Le changement ici c'est pour accepter le : dans un category:whatever, correct ?

(commentaire à 90% fait pour tester les commentaires gitea).

Le changement ici c'est pour accepter le : dans un category:whatever, correct ? (commentaire à 90% fait pour tester les commentaires gitea).

vdeniaud commented

Poster

Owner

Oui, grosse flemme de mettre une regex mais je me plierai à ce que demandera la relecture.

Oui, grosse flemme de mettre une regex mais je me plierai à ce que demandera la relecture.

fpeters marked this conversation as resolved

fpeters approved these changes

vdeniaud commented

Poster

Owner

Mergé manuellement (comme pour https://gitea.entrouvert.org/entrouvert/chrono/pulls/4 mais depuis j'ai activé la détection des merges manuels dans https://gitea.entrouvert.org/entrouvert/chrono/settings, visiblement ça fonctionne mal).

Mergé manuellement (comme pour https://gitea.entrouvert.org/entrouvert/chrono/pulls/4 mais depuis j'ai activé la détection des merges manuels dans https://gitea.entrouvert.org/entrouvert/chrono/settings, visiblement ça fonctionne mal).

vdeniaud closed this pull request

Reviewers

fpeters approved these changes

gitea-wip/chrono/pipeline/pr-main This commit looks good

Details

gitea-wip/chrono/pipeline/head There was a failure building this commit

Details

gitea/chrono/pipeline/head Something is wrong with the build of this commit

Details

This pull request cannot be reopened because the branch was deleted.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b wip/71187-statistiques-ranger-les-agendas- main

git pull origin wip/71187-statistiques-ranger-les-agendas-

Step 2:

Merge the changes and update on Gitea.

git checkout main

git merge --no-ff wip/71187-statistiques-ranger-les-agendas-

git push origin main

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No Assignees

2 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Loading…

There is no content yet.