diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-03-12 01:22:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-12 01:22:44 +0000 |
| commit | 891b84bdf148183ca9fd0f3f515f5cddb6afa03c (patch) | |
| tree | c2ffa327fead14d85c0598d857837e2025bb41a9 | |
| parent | 5d1a9226fc4091af791bc789f2ed2cc56277daf0 (diff) | |
| parent | 8101d1700a493ecf0150cbc50ae03af5df632064 (diff) | |
Merge "Add "Show Relative Dates In Changes Table" to settings preference" into stable-2.16
3 files changed, 20 insertions, 0 deletions
diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html index 3c4270f7e1..412b73eb5e 100644 --- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html +++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.html @@ -208,6 +208,16 @@ limitations under the License. </span> </section> <section> + <span class="title">Show Relative Dates In Changes Table</span> + <span class="value"> + <input + id="relativeDateInChangeTable" + type="checkbox" + checked$="[[_localPrefs.relative_date_in_change_table]]" + on-change="_handleRelativeDateInChangeTable"> + </span> + </section> + <section> <span class="title">Diff view</span> <span class="value"> <gr-select diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js index 916f97f423..706b1ac7db 100644 --- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js +++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view.js @@ -29,6 +29,7 @@ 'signed_off_by', 'email_format', 'size_bar_in_change_table', + 'relative_date_in_change_table', ]; const GERRIT_DOCS_BASE_URL = 'https://gerrit-review.googlesource.com/' + @@ -270,6 +271,11 @@ this._prefsChanged = true; }, + _handleRelativeDateInChangeTable() { + this.set('_localPrefs.relative_date_in_change_table', + this.$.relativeDateInChangeTable.checked); + }, + _handleShowSizeBarsInFileListChanged() { this.set('_localPrefs.size_bar_in_change_table', this.$.showSizeBarsInFileList.checked); diff --git a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html index b0ef704958..a51d310802 100644 --- a/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html +++ b/polygerrit-ui/app/elements/settings/gr-settings-view/gr-settings-view_test.html @@ -88,6 +88,7 @@ limitations under the License. email_strategy: 'ENABLED', email_format: 'HTML_PLAINTEXT', default_base_for_merges: 'FIRST_PARENT', + relative_date_in_change_table: false, size_bar_in_change_table: true, my: [ @@ -151,6 +152,9 @@ limitations under the License. .firstElementChild.bindValue, preferences.email_format); assert.equal(valueOf('Default Base For Merges', 'preferences') .firstElementChild.bindValue, preferences.default_base_for_merges); + assert.equal( + valueOf('Show Relative Dates In Changes Table', 'preferences') + .firstElementChild.checked, false); assert.equal(valueOf('Diff view', 'preferences') .firstElementChild.bindValue, preferences.diff_view); assert.equal(valueOf('Show size bars in file list', 'preferences') |