From 2dd8f7163ef40efaca3b58020eb2e43bb73f8c3c Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Nov 21 2019 15:11:16 +0000 Subject: work in progress --- diff --git a/pagure_bzoverrides/forms.py b/pagure_bzoverrides/forms.py index df2e3f8..fd52a99 100644 --- a/pagure_bzoverrides/forms.py +++ b/pagure_bzoverrides/forms.py @@ -19,13 +19,14 @@ import pagure.forms class BZOverrideForm(pagure.forms.PagureForm): - """ Form to configure the EPEL maintainer for a project. """ + """ Form to configure the Fedora/EPEL maintainer for a project. """ default_assignee = wtforms.SelectField( "Set/Reset EPEL maintainer for this project", [wtforms.validators.DataRequired()], choices=[ ("reset-assignee", "reset-assignee"), - ("set-assignee", "set-assignee"), + ("fedora-assignee", flask.g.fas_user.username), + ("epel-assignee", flask.g.fas_user.username), ], ) diff --git a/pagure_bzoverrides/model.py b/pagure_bzoverrides/model.py index 9eedb16..209c86c 100644 --- a/pagure_bzoverrides/model.py +++ b/pagure_bzoverrides/model.py @@ -46,8 +46,11 @@ class PagureBZOverride(BASE): index=True, ) - default_assignee = sa.Column( - sa.String(255), nullable=False, unique=False, default="no-monitoring" + epel_assignee = sa.Column( + sa.String(255), nullable=False, unique=False, default="" + ) + fedora_assignee = sa.Column( + sa.String(255), nullable=False, unique=False, default="" ) project = relation( diff --git a/pagure_bzoverrides/plugin.py b/pagure_bzoverrides/plugin.py index f79024b..a8ff9f6 100644 --- a/pagure_bzoverrides/plugin.py +++ b/pagure_bzoverrides/plugin.py @@ -37,12 +37,16 @@ DISTGIT_NS = flask.Blueprint( @DISTGIT_NS.route("/bzoverrides//", methods=["GET"]) def bzoverride_get_endpoint(namespace, repo): """ Returns the current default assignee(s) of this package. + Defaults to the repo user if unset. """ -#KH FIXME: should return user and epel maintainer (if set) repo = flask.g.repo - output = {"monitoring": "no-monitoring"} + output = {"fedora-assignee": repo.user.username, + "epel-assignee": repo.user.username } if repo.bzoverride: - output = {"monitoring": repo.bzoverride.default_assignee} + if repo.bzoverride.fedora-assignee: + output["fedora-assignee"] = repo.bzoverride.fedora_assignee + if repo.bzoverride.epel-assignee: + output["epel-assignee"] = repo.bzoverride.epel_assignee return flask.jsonify(output)