modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-05 11:48:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Construct optional_params in base class

Browse Source
This commit is contained in:
Jakub Kadlčík
2017-03-27 13:34:22 +02:00
parent ec0ed91d45
commit 10d3c98381
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module_build_service/views.py
View File

@@ -153,6 +153,11 @@ class ModuleBuildAPI(MethodView):
class BaseHandler(object):
def __init__(self, request):
self.username, self.groups = module_build_service.auth.get_user(request)
self.data = None
@property
def optional_params(self):
return {k: v for k, v in self.data.items() if k not in ["owner", "scmurl", "branch"]}
class SCMHandler(BaseHandler):
@@ -192,9 +197,8 @@ class SCMHandler(BaseHandler):
if isinstance(branch, unicode):
branch = branch.encode('utf-8')
optional_params = {k: v for k, v in self.data.items() if k not in ["owner", "scmurl", "branch"]}
return submit_module_build_from_scm(self.username, url, branch,
allow_local_url=False, optional_params=optional_params)
allow_local_url=False, optional_params=self.optional_params)
class YAMLFileHandler(BaseHandler):
@@ -212,8 +216,7 @@ class YAMLFileHandler(BaseHandler):
def post(self):
r = request.files["yaml"]
optional_params = {k: v for k, v in self.data.items() if k not in ["owner"]}
return submit_module_build_from_yaml(self.username, r.read(), optional_params=optional_params)
return submit_module_build_from_yaml(self.username, r.read(), optional_params=self.optional_params)
def register_api_v1():