From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 11 Feb 2025 10:22:33 +0000 (+0000)
Subject: releases: Fix creating a new release
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90807e6078b901d3554657b1026ba86334eedfa4;p=pbs.git

releases: Fix creating a new release

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/distros.py b/src/buildservice/distros.py
index 8600e8d6..c2154fa0 100644
--- a/src/buildservice/distros.py
+++ b/src/buildservice/distros.py
@@ -362,7 +362,7 @@ class Distro(database.Base, database.BackendMixin, database.SoftDeleteMixin):
 
 		return await self.db.fetch_one(stmt)
 
-	async def create_release(self, name, user, stable=False):
+	async def create_release(self, name, **kwargs):
 		"""
 			Creates a new release
 		"""
@@ -375,8 +375,7 @@ class Distro(database.Base, database.BackendMixin, database.SoftDeleteMixin):
 			distro = self,
 			name   = name,
 			slug   = slug,
-			user   = user,
-			stable = stable,
+			**kwargs,
 		)
 
 		# XXX create image jobs
diff --git a/src/templates/distros/releases/edit.html b/src/templates/distros/releases/edit.html
index 3851807f..58823b89 100644
--- a/src/templates/distros/releases/edit.html
+++ b/src/templates/distros/releases/edit.html
@@ -1,6 +1,14 @@
-{% extends "../../modal.html" %}
+{% extends "modal.html" %}
 
-{% block title %}{{ distro }} - {{ _("Create Release")}}{% end block %}
+{% block title %}
+	{{ distro }}
+	-
+	{% if release %}
+		{{ _("Edit Release") }}
+	{% else %}
+		{{ _("Create Release")}}
+	{% endif %}
+{% endblock %}
 
 {% block breadcrumbs %}
 	<nav class="breadcrumb" aria-label="breadcrumbs">
@@ -29,10 +37,10 @@
 				<li class="is-active">
 					<a href="#" aria-current="page">{{ _("Create") }}</a>
 				</li>
-			{% end %}
+			{% endif %}
 		</ul>
 	</nav>
-{% end block %}
+{% endblock %}
 
 {% block modal_title %}
 	<h4 class="title is-4">
@@ -40,22 +48,24 @@
 			{{ _("Edit Release") }}
 		{% else %}
 			{{ _("Create Release") }}
-		{% end %}
+		{% endif %}
 	</h4>
+
 	<h6 class="subtitle is-6">{{ distro }}</h6>
-{% end block %}
+{% endblock %}
 
 {% block modal %}
 	<form method="POST" action="">
-		{% raw xsrf_form_html() %}
+		{{ xsrf_form_html() | safe }}
 
 		{# Name #}
 		<div class="field">
 			<label class="label">{{ _("Name") }}</label>
+
 			<div class="control">
 				<input class="input" type="text" name="name"
 					placeholder="{{ _("Name") }}" required
-					{% if release %}value="{{ release.name }}"{% end %}>
+					{% if release %}value="{{ release.name }}"{% endif %}>
 			</div>
 		</div>
 
@@ -63,9 +73,10 @@
 		<div class="field">
 			<label class="checkbox">
 				<input type="checkbox" name="stable"
-						{% if release and release.stable %}checked{% end %}>
+						{% if release and release.stable %}checked{% endif %}>
 					{{ _("Stable Release")}}
 			</label>
+
 			<p class="help">
 				{{ _("Check this box, if this release is a stable release") }}
 			</p>
@@ -74,9 +85,10 @@
 		{# Announcement #}
 		<div class="field">
 			<label class="label">{{ _("Announcement") }}</label>
+
 			<div class="control">
-				<textarea class="input" name="announcement" placeholder="{{ _("Announcement") }}"
-					rows="16">{% if release %}{{ release.announcement }}{% end %}</textarea>
+				<textarea class="textarea" name="announcement" placeholder="{{ _("Announcement") }}"
+					rows="16">{% if release %}{{ release.announcement }}{% endif %}</textarea>
 			</div>
 		</div>
 
@@ -90,7 +102,7 @@
 				<button type="submit" class="button is-success is-fullwidth">
 					{{ _("Create") }}
 				</button>
-			{% end %}
+			{% endif %}
 		</div>
 	</form>
-{% end block %}
+{% endblock %}
diff --git a/src/web/distributions.py b/src/web/distributions.py
index 274fedde..6dc58a63 100644
--- a/src/web/distributions.py
+++ b/src/web/distributions.py
@@ -98,7 +98,7 @@ class ReleasesCreateHandler(base.BaseHandler):
 		if not distro.has_perm(self.current_user):
 			raise tornado.web.HTTPError(403)
 
-		self.render("distros/releases/edit.html", release=None, distro=distro)
+		await self.render("distros/releases/edit.html", release=None, distro=distro)
 
 	@base.authenticated
 	async def post(self, distro_slug):
@@ -110,19 +110,15 @@ class ReleasesCreateHandler(base.BaseHandler):
 		if not distro.has_perm(self.current_user):
 			raise tornado.web.HTTPError(403)
 
-		# Fetch arguments
-		name   = self.get_argument("name")
-		stable = self.get_argument_bool("stable")
-
-		with self.db.transaction():
-			# Create the new release
-			release = self.backend.distros.releases.create(
-				distro=distro, name=name, stable=stable, user=self.current_user,
+		# Create the new release
+		async with await self.db.transaction():
+			release = await distro.create_release(
+				name         = self.get_argument("name"),
+				stable       = self.get_argument_bool("stable"),
+				created_by   = self.current_user,
+				announcement = self.get_argument("announcement", None)
 			)
 
-			# Store announcement
-			release.announcement = self.get_argument("announcement", None)
-
 		# Redirect to the new release page
 		self.redirect(release.url)