external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: remove unused "Merge into" input from /packages

Browse source 
When using this input on `live` as a TU, the field is not
taken into account. Tried with no action and with the
Delete Packages action, which ended up deleting the packages
but not merging into the given target.

So, this commit removes that input from the page.

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-10-20 23:27:07 -07:00
parent f5e38e9979
commit 5ae9d09e98
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aurweb/routers/packages.py
View file

@ -1053,7 +1053,6 @@ PACKAGE_ACTIONS = {}
async def packages_post(request: Request, async def packages_post(request: Request,
IDs: List[int] = Form(default=[]), IDs: List[int] = Form(default=[]),
action: str = Form(default=str()), action: str = Form(default=str()),
merge_into: str = Form(default=str()),
confirm: bool = Form(default=False)): confirm: bool = Form(default=False)):
# If an invalid action is specified, just render GET /packages # If an invalid action is specified, just render GET /packages
@ -1067,8 +1066,7 @@ async def packages_post(request: Request,
# We deal with `IDs`, `merge_into` and `confirm` arguments # We deal with `IDs`, `merge_into` and `confirm` arguments
# within action callbacks. # within action callbacks.
callback = PACKAGE_ACTIONS.get(action) callback = PACKAGE_ACTIONS.get(action)
retval = await callback(request, package_ids=IDs, merge_into=merge_into, retval = await callback(request, package_ids=IDs, confirm=confirm)
confirm=confirm)
if retval: # If *anything* was returned: if retval: # If *anything* was returned:
success, messages = retval success, messages = retval
if not success: if not success:

5
templates/partials/packages/search_actions.html
View file

@ -11,11 +11,6 @@
<option value="unnotify">{{ "UnNotify" | tr }}</option> <option value="unnotify">{{ "UnNotify" | tr }}</option>
</select> </select>
{% if request.user.is_trusted_user() or request.user.is_developer() %}
<label for="merge_into">{{ "Merge into" | tr }}</label>
<input id="merge_into" type="text" name="merge_into" />
{% endif %}
<label class="confirmation"> <label class="confirmation">
<input type="checkbox" name="confirm" /> <input type="checkbox" name="confirm" />
{{ "Confirm" | tr }} {{ "Confirm" | tr }}