entrouvert
/
hobo
16
0
Fork 0
Code Issues Pull Requests 16 Releases Activity

applications: add possibility to define parameters (#76463) #34

Merged
fpeters merged 2 commits from wip/76463-application-parameters into main 2023-05-30 08:45:13 +02:00
Conversation 1 Commits 2 Files Changed 12 +475 -12
fpeters commented 2023-04-10 10:50:45 +02:00
Owner
Copy Link
No description provided.
fpeters added 1 commit 2023-04-10 10:50:46 +02:00
fpeters force-pushed wip/76463-application-parameters from 432ba687d9 to d04ea6bdf9 2023-04-10 16:27:37 +02:00 Compare
fpeters force-pushed wip/76463-application-parameters from d04ea6bdf9 to a647711eab 2023-04-10 16:35:14 +02:00 Compare
fpeters force-pushed wip/76463-application-parameters from a647711eab to facf274213 2023-04-10 17:55:16 +02:00 Compare
fpeters force-pushed wip/76463-application-parameters from facf274213 to 6569c812b5 2023-04-10 18:06:19 +02:00 Compare
fpeters force-pushed wip/76463-application-parameters from 6569c812b5 to 697b65af94 2023-04-10 18:22:54 +02:00 Compare
fpeters force-pushed wip/76463-application-parameters from 697b65af94 to 7951195425 2023-05-29 14:58:28 +02:00 Compare
fpeters changed title from WIP: applications: add possibility to define parameters (#76463) to applications: add possibility to define parameters (#76463) 2023-05-29 17:40:59 +02:00
lguerin reviewed 2023-05-29 18:55:58 +02:00
hobo/applications/templates/hobo/applications/manifest.html Outdated
@ -79,0 +95,4 @@
{% elif app.editable %}
<p>{% trans "No parameters defined." %}</p>
{% endif %}
{% if app.parameter_set.exists %}
lguerin commented 2023-05-29 18:51:55 +02:00
Owner
Copy Link

has_parameters ?

has_parameters ?
fpeters commented 2023-05-29 19:20:17 +02:00
Author
Owner
Copy Link

Oui, modifié. (j'ai mis toutes les modifications dans un commit séparé, pour mieux les voir).

Oui, modifié. (j'ai mis toutes les modifications dans un commit séparé, pour mieux les voir).
hobo/applications/templates/hobo/applications/manifest.html Outdated
@ -79,0 +97,4 @@
{% endif %}
{% if app.parameter_set.exists %}
<div class="app-parameters--values">
{% for parameter in app.parameter_set.all %}
lguerin commented 2023-05-29 18:52:55 +02:00
Owner
Copy Link

potentiellement 2 fois le meme qs que ligne 89

potentiellement 2 fois le meme qs que ligne 89
fpeters commented 2023-05-29 19:21:06 +02:00
Author
Owner
Copy Link

Je l'ai posé dans le {% with %} pour que ça soit partagé, en imaginant que ça permet ainsi d'économiser la requête.

Je l'ai posé dans le {% with %} pour que ça soit partagé, en imaginant que ça permet ainsi d'économiser la requête.
hobo/applications/views.py Outdated
@ -454,0 +462,4 @@
fields = ['label', 'name', 'default_value']
def form_valid(self, form):
form.instance.application = Application.objects.get(slug=self.kwargs['app_slug'])
lguerin commented 2023-05-29 18:54:42 +02:00
Owner
Copy Link

j'aurais bien ajouté editable=True au qs :)
(et get_object_or_404 permet d'éviter une 500, au cas où)

j'aurais bien ajouté editable=True au qs :) (et get_object_or_404 permet d'éviter une 500, au cas où)
fpeters commented 2023-05-29 19:21:42 +02:00
Author
Owner
Copy Link

Voilà, passé à get_object_or_404 + editable=True.

Voilà, passé à get_object_or_404 + editable=True.
hobo/applications/views.py Outdated
@ -454,0 +472,4 @@
add_parameter = AddParameterView.as_view()
class EditParameterView(UpdateView):
lguerin commented 2023-05-29 18:55:33 +02:00
Owner
Copy Link

là aussi, restriction sur Application editable=True ?

là aussi, restriction sur Application editable=True ?
fpeters commented 2023-05-29 19:22:06 +02:00
Author
Owner
Copy Link

Fait, différemment ici,

+    def get_queryset(self):
+        return (
+            super()
+            .get_queryset()
+            .filter(application__editable=True, application__slug=self.kwargs['app_slug'])
+        )
Fait, différemment ici, ``` + def get_queryset(self): + return ( + super() + .get_queryset() + .filter(application__editable=True, application__slug=self.kwargs['app_slug']) + ) ```
hobo/applications/views.py Outdated
@ -454,0 +484,4 @@
edit_parameter = EditParameterView.as_view()
class DeleteParameterView(DeleteView):
lguerin commented 2023-05-29 18:55:48 +02:00
Owner
Copy Link

idem editable = True

idem editable = True
fpeters commented 2023-05-29 19:22:24 +02:00
Author
Owner
Copy Link

Fait de la même manière que l'update.

Fait de la même manière que l'update.
fpeters added 1 commit 2023-05-29 19:19:29 +02:00
gitea/hobo/pipeline/head This commit looks good Details
46c9e50dfa fixup
lguerin approved these changes 2023-05-29 19:45:46 +02:00
lguerin commented 2023-05-29 19:46:22 +02:00
Owner
Copy Link

(cool le fixup, ça facilite la relecture de relecture)

(cool le fixup, ça facilite la relecture de relecture)
fpeters force-pushed wip/76463-application-parameters from 46c9e50dfa to 5e7f1599f5 2023-05-30 08:37:38 +02:00 Compare
fpeters merged commit 5e7f1599f5 into main 2023-05-30 08:45:13 +02:00
fpeters deleted branch wip/76463-application-parameters 2023-05-30 08:45:14 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
lguerin
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/hobo#34
No description provided.
Delete Branch "wip/76463-application-parameters"

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?