Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
aurweb
Commits
beed64e0
Verified
Commit
beed64e0
authored
Oct 19, 2021
by
Kevin Morris
Browse files
fix(fastapi): persist package request form inputs
Signed-off-by:
Kevin Morris
<
kevr@0cost.org
>
parent
b4092fe7
Changes
2
Hide whitespace changes
Inline
Side-by-side
aurweb/routers/packages.py
View file @
beed64e0
...
...
@@ -18,7 +18,7 @@ from aurweb.packages.search import PackageSearch
from
aurweb.packages.util
import
get_pkg_or_base
,
get_pkgbase_comment
,
query_notified
,
query_voted
from
aurweb.scripts
import
notify
,
popupdate
from
aurweb.scripts.rendercomment
import
update_comment_render
from
aurweb.templates
import
make_context
,
render_raw_template
,
render_template
from
aurweb.templates
import
make_context
,
make_variable_context
,
render_raw_template
,
render_template
router
=
APIRouter
()
...
...
@@ -636,7 +636,7 @@ async def requests(request: Request,
@
router
.
get
(
"/pkgbase/{name}/request"
)
@
auth_required
(
True
,
redirect
=
"/pkgbase/{name}"
)
async
def
package_request
(
request
:
Request
,
name
:
str
):
context
=
mak
e_context
(
request
,
"Submit Request"
)
context
=
await
make_variabl
e_context
(
request
,
"Submit Request"
)
pkgbase
=
db
.
query
(
models
.
PackageBase
).
filter
(
models
.
PackageBase
.
Name
==
name
).
first
()
...
...
@@ -657,7 +657,7 @@ async def pkgbase_request_post(request: Request, name: str,
pkgbase
=
get_pkg_or_base
(
name
,
models
.
PackageBase
)
# Create our render context.
context
=
mak
e_context
(
request
,
"Submit Request"
)
context
=
await
make_variabl
e_context
(
request
,
"Submit Request"
)
context
[
"pkgbase"
]
=
pkgbase
if
type
not
in
{
"deletion"
,
"merge"
,
"orphan"
}:
# In the case that someone crafted a POST request with an invalid
...
...
templates/pkgbase/request.html
View file @
beed64e0
...
...
@@ -30,9 +30,21 @@
<p>
<label
for=
"id_type"
>
{{ "Request type" | tr }}:
</label>
<select
id=
"id_type"
name=
"type"
>
<option
value=
"deletion"
>
{{ "Deletion" | tr }}
</option>
<option
value=
"merge"
>
{{ "Merge" | tr }}
</option>
<option
value=
"orphan"
>
{{ "Orphan" | tr }}
</option>
<option
value=
"deletion"
{%
if
type =
=
"
deletion
"
%}
selected
{%
endif
%}
>
{{ "Deletion" | tr }}
</option>
<option
value=
"merge"
{%
if
type =
=
"
merge
"
%}
selected
{%
endif
%}
>
{{ "Merge" | tr }}
</option>
<option
value=
"orphan"
{%
if
type =
=
"
orphan
"
%}
selected
{%
endif
%}
>
{{ "Orphan" | tr }}
</option>
</select>
</p>
...
...
@@ -44,13 +56,13 @@
<p
id=
"merge_section"
style=
"display: none"
>
<label
for=
"id_merge_into"
>
{{ "Merge into" | tr }}:
</label>
<input
id=
"id_merge_into"
type=
"text"
name=
"merge_into"
autocomplete=
"off"
/>
autocomplete=
"off"
value=
"{{ merge_into or '' }}"
/>
</p>
<p>
<label
for=
"id_comments"
>
{{ "Comments" | tr }}:
</label>
<textarea
id=
"id_comments"
name=
"comments"
rows=
"5"
cols=
"50"
></textarea>
rows=
"5"
cols=
"50"
>
{{ comments or '' }}
</textarea>
</p>
<p
id=
"deletion_hint"
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment