From 222f591deb656ad0379ce70a0c903891ac1af02e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 23 Aug 2019 16:16:30 +0200 Subject: [PATCH] [IMP] runbot_merge: ACL & PR name * add missing ACL for PR feedback object * configure name_get for PRs (which don't have a name), fixes some layout issues & stuff --- runbot_merge/models/pull_requests.py | 10 ++++++++++ runbot_merge/security/ir.model.access.csv | 2 ++ 2 files changed, 12 insertions(+) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index e5ad1dd7..66a568d4 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -513,6 +513,16 @@ class PullRequests(models.Model): help="PR is not currently stageable for some reason (mostly an issue if status is ready)" ) + @api.depends('repository.name', 'number') + def _compute_display_name(self): + return super(PullRequests, self)._compute_display_name() + + def name_get(self): + return { + p.id: '%s:%s' % (p.repository.name, p.number) + for p in self + } + # missing link to other PRs @api.depends('priority', 'state', 'squash', 'merge_method', 'batch_id.active', 'label') def _compute_is_blocked(self): diff --git a/runbot_merge/security/ir.model.access.csv b/runbot_merge/security/ir.model.access.csv index 7618b609..fb31ca5b 100644 --- a/runbot_merge/security/ir.model.access.csv +++ b/runbot_merge/security/ir.model.access.csv @@ -9,7 +9,9 @@ access_runbot_merge_stagings_admin,Admin access to stagings,model_runbot_merge_s access_runbot_merge_split_admin,Admin access to splits,model_runbot_merge_split,runbot_merge.group_admin,1,1,1,1 access_runbot_merge_batch_admin,Admin access to batches,model_runbot_merge_batch,runbot_merge.group_admin,1,1,1,1 access_runbot_merge_fetch_job_admin,Admin access to fetch jobs,model_runbot_merge_fetch_job,runbot_merge.group_admin,1,1,1,1 +access_runbot_merge_pull_requests_feedback_admin,Admin access to feedback,model_runbot_merge_pull_requests_feedback,runbot_merge.group_admin,1,1,1,1 access_runbot_merge_project,User access to project,model_runbot_merge_project,base.group_user,1,0,0,0 access_runbot_merge_repository,User access to repo,model_runbot_merge_repository,base.group_user,1,0,0,0 access_runbot_merge_branch,User access to branches,model_runbot_merge_branch,base.group_user,1,0,0,0 access_runbot_merge_pull_requests,User access to PR,model_runbot_merge_pull_requests,base.group_user,1,0,0,0 +access_runbot_merge_pull_requests_feedback,Users have no reason to access feedback,model_runbot_merge_pull_requests_feedback,,0,0,0,0