From 2686c935e77d3a219b6a4adca938e36b2ff86c7c Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Nov 21 2019 14:18:41 +0000 Subject: WIP --- diff --git a/pagure_bzoverrides/forms.py b/pagure_bzoverrides/forms.py index 0a053ec..df2e3f8 100644 --- a/pagure_bzoverrides/forms.py +++ b/pagure_bzoverrides/forms.py @@ -18,7 +18,7 @@ import wtforms import pagure.forms -class AnityaForm(pagure.forms.PagureForm): +class BZOverrideForm(pagure.forms.PagureForm): """ Form to configure the EPEL maintainer for a project. """ default_assignee = wtforms.SelectField( diff --git a/pagure_bzoverrides/plugin.py b/pagure_bzoverrides/plugin.py index 4410116..f79024b 100644 --- a/pagure_bzoverrides/plugin.py +++ b/pagure_bzoverrides/plugin.py @@ -35,21 +35,22 @@ DISTGIT_NS = flask.Blueprint( @DISTGIT_NS.route("/bzoverrides//", methods=["GET"]) -def anitya_get_endpoint(namespace, repo): - """ Returns the current status of the monitoring in anitya of this package. +def bzoverride_get_endpoint(namespace, repo): + """ Returns the current default assignee(s) of this package. """ +#KH FIXME: should return user and epel maintainer (if set) repo = flask.g.repo output = {"monitoring": "no-monitoring"} - if repo.anitya: - output = {"monitoring": repo.anitya.anitya_status} + if repo.bzoverride: + output = {"monitoring": repo.bzoverride.default_assignee} return flask.jsonify(output) @DISTGIT_NS.route("/bzoverrides//", methods=["POST"]) @api_login_required(acls=["modify_project"]) @api_method -def anitya_patch_endpoint(namespace, repo): - """ Updates the current status of the monitoring in anitya of this package. +def bzoverride_patch_endpoint(namespace, repo): + """ Updates the default assignees of this package. """ repo = _get_repo(repo, namespace=namespace) @@ -69,14 +70,14 @@ def anitya_patch_endpoint(namespace, repo): 401, error_code=APIERROR.EMODIFYPROJECTNOTALLOWED ) - form = pagure_distgit.forms.AnityaForm(csrf_enabled=False) + form = pagure_distgit.forms.BZOverrideForm(csrf_enabled=False) if form.validate_on_submit(): try: - if repo.anitya: - repo.anitya.anitya_status = form.anitya_status.data + if repo.bzoverride: + repo.bzoverride.default_assignee = form.default_assignee.data flask.g.session.add(repo) else: - mapping = model.PagureAnitya( + mapping = model.PagureBZOverride( #KH FIXME: needs to show new form to select user, or maybe use current user project_id=repo.id, default_assignee=form.default_assignee.data ) @@ -91,7 +92,7 @@ def anitya_patch_endpoint(namespace, repo): 400, error_code=APIERROR.EINVALIDREQ, errors=form.errors ) - return anitya_get_endpoint(namespace, repo.name) + return bzoverride_get_endpoint(namespace, repo.name) @DISTGIT_NS.route("/actived//", methods=["GET"])