From 659ba7d0ec4f87bdc06fb21a1f4a55b5cda36d3b Mon Sep 17 00:00:00 2001 From: Becky Siegel Date: Wed, 13 Dec 2017 19:09:25 -0800 Subject: [PATCH] Add default values in create project dialog and group config A previous fix (change 146550) for gr-select surfaced another issue that was previously masked by it. gr-select takes a bind-value but in cases where that value is not supplied, the dropdown appears to be blank. In order to have the correct default values, the objects being two way bound have to get set to have the default value. Bug: Issue 7973 Change-Id: Ied00a4c297fb85dbd63838395d67e36aa3fb0947 (cherry picked from commit 8b7d50b3c8f7db4e3592535ed0687f8ea442c1c6) --- .../gr-create-project-dialog.js | 8 +++++++- .../gr-create-project-dialog_test.html | 5 +++++ .../app/elements/admin/gr-group/gr-group.html | 1 + polygerrit-ui/app/elements/admin/gr-group/gr-group.js | 7 +++++++ .../app/elements/admin/gr-group/gr-group_test.html | 11 +++++++++++ 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/polygerrit-ui/app/elements/admin/gr-create-project-dialog/gr-create-project-dialog.js b/polygerrit-ui/app/elements/admin/gr-create-project-dialog/gr-create-project-dialog.js index 94f782ddf3..3831534b81 100644 --- a/polygerrit-ui/app/elements/admin/gr-create-project-dialog/gr-create-project-dialog.js +++ b/polygerrit-ui/app/elements/admin/gr-create-project-dialog/gr-create-project-dialog.js @@ -28,7 +28,13 @@ /** @type {?} */ _projectConfig: { type: Object, - value: () => { return {}; }, + value: () => { + // Set default values for dropdowns. + return { + create_empty_commit: false, + permissions_only: false, + }; + }, }, _projectCreated: { type: Boolean, diff --git a/polygerrit-ui/app/elements/admin/gr-create-project-dialog/gr-create-project-dialog_test.html b/polygerrit-ui/app/elements/admin/gr-create-project-dialog/gr-create-project-dialog_test.html index 5fcdd0b910..e9a644f10f 100644 --- a/polygerrit-ui/app/elements/admin/gr-create-project-dialog/gr-create-project-dialog_test.html +++ b/polygerrit-ui/app/elements/admin/gr-create-project-dialog/gr-create-project-dialog_test.html @@ -48,6 +48,11 @@ limitations under the License. sandbox.restore(); }); + test('default values are populated', () => { + assert.isFalse(element.$.initalCommit.bindValue); + assert.isFalse(element.$.parentProject.bindValue); + }); + test('project created', done => { const configInputObj = { name: 'test-project', diff --git a/polygerrit-ui/app/elements/admin/gr-group/gr-group.html b/polygerrit-ui/app/elements/admin/gr-group/gr-group.html index 0449ffa511..33866d3328 100644 --- a/polygerrit-ui/app/elements/admin/gr-group/gr-group.html +++ b/polygerrit-ui/app/elements/admin/gr-group/gr-group.html @@ -128,6 +128,7 @@ limitations under the License.