diff --git a/td.server/src/controllers/threatmodelcontroller.js b/td.server/src/controllers/threatmodelcontroller.js index 6b22e2fd..2936d561 100644 --- a/td.server/src/controllers/threatmodelcontroller.js +++ b/td.server/src/controllers/threatmodelcontroller.js @@ -54,7 +54,11 @@ const branches = (req, res) => responseWrapper.sendResponseAsync(async () => { const headers = branchesResp[1]; const pageLinks = branchesResp[2]; - const branchNames = branches.map((x) => x.name); + const branchNames = branches.map((x) => ({ + name: x.name, + // Protected branches are not so easy to determine from the API on Bitbucket + protected: x.protected||false + })); const pagination = getPagination(headers, pageLinks, repoInfo.page); diff --git a/td.vue/src/components/AddBranchDialog.vue b/td.vue/src/components/AddBranchDialog.vue index 5dfb657e..d8ed8b3b 100644 --- a/td.vue/src/components/AddBranchDialog.vue +++ b/td.vue/src/components/AddBranchDialog.vue @@ -8,7 +8,7 @@ :title="modalTitle" visible centered - @hide="closeAddBranchDialog" + @hide="closeDialog" hide-footer >