entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 4 Releases Wiki Activity

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
pull from: wip/71187-statistiques-ranger-les-agendas-
merge into: entrouvert:main
Conversation 1 Commits 1 Files Changed 3 +98 -17
vdeniaud commented 2022-11-14 16:19:42 +01:00
Owner
Copy Link
No description provided.
vdeniaud force-pushed wip/71187-statistiques-ranger-les-agendas- from 0650f9c585 to e220f39954 2022-11-14 16:38:30 +01:00 Compare
fpeters reviewed 2022-11-14 16:39:29 +01:00
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 2022-11-14 16:39:29 +01:00
Owner
Copy Link

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 2022-11-14 16:41:03 +01:00
Author
Owner
Copy Link

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 2022-11-14 18:32:57 +01:00
vdeniaud commented 2022-11-15 10:16:21 +01:00
Author
Owner
Copy Link

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 2022-11-15 10:16:21 +01:00
Some checks reported errors
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

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
fpeters
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
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.

Reference: entrouvert/chrono#8
No description provided.
Delete Branch "wip/71187-statistiques-ranger-les-agendas-"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?