diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-05-08 01:31:01 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-08 01:31:01 +0300 |
commit | 0b9328a1be6e1b9b9826d4a0ea987d43cb3d4dbb (patch) | |
tree | db7df8f34e82d313e33f60094c81fb860e9e9ec2 | |
parent | fc033c30e63f03fb55479892b2c5c75cee30e509 (diff) | |
parent | c43508cacbd64357409a3de114db9dab2ae59a9d (diff) | |
download | wekan-0b9328a1be6e1b9b9826d4a0ea987d43cb3d4dbb.tar.gz wekan-0b9328a1be6e1b9b9826d4a0ea987d43cb3d4dbb.tar.bz2 wekan-0b9328a1be6e1b9b9826d4a0ea987d43cb3d4dbb.zip |
Merge pull request #1627 from thiagofernando/devel
Includes possibility to block username change
48 files changed, 106 insertions, 72 deletions
diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade index 479ccd3e..5bc7972d 100644 --- a/client/components/settings/settingBody.jade +++ b/client/components/settings/settingBody.jade @@ -94,7 +94,7 @@ template(name='email') template(name='accountSettings') ul#account-setting.setting-detail - li.smtp-form + li.accounts-form .title {{_ 'accounts-allowEmailChange'}} .form-group.flex input.form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="true" checked="{{#if allowEmailChange}}checked{{/if}}") @@ -102,6 +102,14 @@ template(name='accountSettings') input.form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="false" checked="{{#unless allowEmailChange}}checked{{/unless}}") span {{_ 'no'}} li + li.accounts-form + .title {{_ 'accounts-allowUserNameChange'}} + .form-group.flex + input.form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="true" checked="{{#if allowUserNameChange}}checked{{/if}}") + span {{_ 'yes'}} + input.form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="false" checked="{{#unless allowUserNameChange}}checked{{/unless}}") + span {{_ 'no'}} + li button.js-accounts-save.primary {{_ 'save'}} template(name='announcementSettings') diff --git a/client/components/settings/settingBody.js b/client/components/settings/settingBody.js index 8c1ff1c7..7230d893 100644 --- a/client/components/settings/settingBody.js +++ b/client/components/settings/settingBody.js @@ -23,7 +23,7 @@ BlazeComponent.extendComponent({ checkField(selector) { const value = $(selector).val(); - if(!value || value.trim() === ''){ + if (!value || value.trim() === '') { $(selector).parents('li.smtp-form').addClass('has-error'); throw Error('blank field'); } else { @@ -31,7 +31,7 @@ BlazeComponent.extendComponent({ } }, - currentSetting(){ + currentSetting() { return Settings.findOne(); }, @@ -44,23 +44,23 @@ BlazeComponent.extendComponent({ sort: ['title'], }); }, - toggleRegistration(){ + toggleRegistration() { this.setLoading(true); const registrationClosed = this.currentSetting().disableRegistration; - Settings.update(Settings.findOne()._id, {$set:{disableRegistration: !registrationClosed}}); + Settings.update(Settings.findOne()._id, {$set: {disableRegistration: !registrationClosed}}); this.setLoading(false); - if(registrationClosed){ + if (registrationClosed) { $('.invite-people').slideUp(); - }else{ + } else { $('.invite-people').slideDown(); } }, - toggleTLS(){ + toggleTLS() { $('#mail-server-tls').toggleClass('is-checked'); }, - switchMenu(event){ + switchMenu(event) { const target = $(event.target); - if(!target.hasClass('active')){ + if (!target.hasClass('active')) { $('.side-menu li.active').removeClass('active'); target.parent().addClass('active'); const targetID = target.data('id'); @@ -71,9 +71,9 @@ BlazeComponent.extendComponent({ } }, - checkBoard(event){ + checkBoard(event) { let target = $(event.target); - if(!target.hasClass('js-toggle-board-choose')){ + if (!target.hasClass('js-toggle-board-choose')) { target = target.parent(); } const checkboxId = target.attr('id'); @@ -81,7 +81,7 @@ BlazeComponent.extendComponent({ $(`#${checkboxId}`).toggleClass('is-checked'); }, - inviteThroughEmail(){ + inviteThroughEmail() { const emails = $('#email-to-invite').val().trim().split('\n').join(',').split(','); const boardsToInvite = []; $('.js-toggle-board-choose .materialCheckBox.is-checked').each(function () { @@ -104,19 +104,23 @@ BlazeComponent.extendComponent({ } }, - saveMailServerInfo(){ + saveMailServerInfo() { this.setLoading(true); $('li').removeClass('has-error'); - try{ + try { const host = this.checkField('#mail-server-host'); const port = this.checkField('#mail-server-port'); const username = $('#mail-server-username').val().trim(); const password = $('#mail-server-password').val().trim(); const from = this.checkField('#mail-server-from'); const tls = $('#mail-server-tls.is-checked').length > 0; - Settings.update(Settings.findOne()._id, {$set:{'mailServer.host':host, 'mailServer.port': port, 'mailServer.username': username, - 'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from}}); + Settings.update(Settings.findOne()._id, { + $set: { + 'mailServer.host': host, 'mailServer.port': port, 'mailServer.username': username, + 'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from, + }, + }); } catch (e) { return; } finally { @@ -136,11 +140,12 @@ BlazeComponent.extendComponent({ const message = `${TAPi18n.__(err.error)}\n${reason}`; console.log(message, err); alert(message); - } /* eslint-enable no-console */ + } + /* eslint-enable no-console */ }); }, - events(){ + events() { return [{ 'click a.js-toggle-registration': this.toggleRegistration, 'click a.js-toggle-tls': this.toggleTLS, @@ -154,20 +159,28 @@ BlazeComponent.extendComponent({ }).register('setting'); BlazeComponent.extendComponent({ - saveAllowEmailChange() { + + saveAccountsChange() { const allowEmailChange = ($('input[name=allowEmailChange]:checked').val() === 'true'); + const allowUserNameChange = ($('input[name=allowUserNameChange]:checked').val() === 'true'); AccountSettings.update('accounts-allowEmailChange', { - $set: { 'booleanValue': allowEmailChange }, + $set: {'booleanValue': allowEmailChange}, + }); + AccountSettings.update('accounts-allowUserNameChange', { + $set: {'booleanValue': allowUserNameChange}, }); }, allowEmailChange() { return AccountSettings.findOne('accounts-allowEmailChange').booleanValue; }, + allowUserNameChange() { + return AccountSettings.findOne('accounts-allowUserNameChange').booleanValue; + }, events() { return [{ - 'click button.js-accounts-save': this.saveAllowEmailChange, + 'click button.js-accounts-save': this.saveAccountsChange, }]; }, }).register('accountSettings'); @@ -181,27 +194,27 @@ BlazeComponent.extendComponent({ this.loading.set(w); }, - currentSetting(){ + currentSetting() { return Announcements.findOne(); }, saveMessage() { const message = $('#admin-announcement').val().trim(); Announcements.update(Announcements.findOne()._id, { - $set: { 'body': message }, + $set: {'body': message}, }); }, - toggleActive(){ + toggleActive() { this.setLoading(true); const isActive = this.currentSetting().enabled; Announcements.update(Announcements.findOne()._id, { - $set:{ 'enabled': !isActive}, + $set: {'enabled': !isActive}, }); this.setLoading(false); - if(isActive){ + if (isActive) { $('.admin-announcement').slideUp(); - }else{ + } else { $('.admin-announcement').slideDown(); } }, diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index 4ac59f45..a8fdb143 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -33,7 +33,10 @@ template(name="editProfilePopup") | {{_ 'username'}} span.error.hide.username-taken | {{_ 'error-username-taken'}} - input.js-profile-username(type="text" value=username) + if allowUserNameChange + input.js-profile-username(type="text" value=username) + else + input.js-profile-username(type="text" value=username readonly) label | {{_ 'initials'}} input.js-profile-initials(type="text" value=profile.initials) diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index be7d4dcb..d96a9b3d 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -24,6 +24,9 @@ Template.editProfilePopup.helpers({ allowEmailChange() { return AccountSettings.findOne('accounts-allowEmailChange').booleanValue; }, + allowUserNameChange() { + return AccountSettings.findOne('accounts-allowUserNameChange').booleanValue; + }, }); Template.editProfilePopup.events({ diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index c91f0225..a9e4edbd 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index e1c76a3d..998bc2cb 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index 26367e66..51d90051 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index cea7aa35..4379081b 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index 926c44f5..fc5a0dfb 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Končí v", "editCardReceivedDatePopup-title": "Změnit datum přijetí", "editCardEndDatePopup-title": "Změnit datum konce" -}
\ No newline at end of file +} diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index c27ba255..fb98a950 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Endet am", "editCardReceivedDatePopup-title": "Empfangsdatum ändern", "editCardEndDatePopup-title": "Enddatum ändern" -}
\ No newline at end of file +} diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index ae1d7317..bf36bcab 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index 4a4b96da..d51127d8 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 1f46dce6..6e7d5526 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -434,6 +434,7 @@ "no": "No", "accounts": "Accounts", "accounts-allowEmailChange": "Allow Email Change", + "accounts-allowUserNameChange": "Allow Username Change", "createdAt": "Created at", "verified": "Verified", "active": "Active", diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index 09c4ddb2..b5fa9a39 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index e9a7d38c..60c1c114 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Termina en", "editCardReceivedDatePopup-title": "Cambiar fecha de recepción", "editCardEndDatePopup-title": "Cambiar fecha de término" -}
\ No newline at end of file +} diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index c1d9fa3c..c8b0f422 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Finalizado el", "editCardReceivedDatePopup-title": "Cambiar la fecha de recepción", "editCardEndDatePopup-title": "Cambiar la fecha de finalización" -}
\ No newline at end of file +} diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index c57233a4..6c692aea 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index cb963369..4c03a3b7 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "پایان در", "editCardReceivedDatePopup-title": "تغییر تاریخ رسید", "editCardEndDatePopup-title": "تغییر تاریخ پایان" -}
\ No newline at end of file +} diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 35e98eeb..054e9969 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Loppuu", "editCardReceivedDatePopup-title": "Vaihda vastaanottamispäivää", "editCardEndDatePopup-title": "Vaihda loppumispäivää" -}
\ No newline at end of file +} diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index bc51682b..ce8034b0 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Se termine le", "editCardReceivedDatePopup-title": "Changer la date de réception", "editCardEndDatePopup-title": "Changer la date de fin" -}
\ No newline at end of file +} diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 4539656e..9e23ea41 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index a2ca8e9d..5f21384a 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index eeb7b24a..fc1f2e8c 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index afc4cfa8..42725bbf 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index f9fbb1b0..e3ee3399 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index 360eb6bb..e2edbe31 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 2908c287..9229c2e8 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Termina il", "editCardReceivedDatePopup-title": "Cambia data ricezione", "editCardEndDatePopup-title": "Cambia data finale" -}
\ No newline at end of file +} diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 59b7b02a..7c7db1b4 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index 1eb8f47e..bee42e39 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index 29a4f808..1231a013 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index 208b4b9c..346110c5 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 4cb55831..a33240e8 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 2896d5b1..72ef0f44 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index d1a91b2d..4ce864bd 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 976379f5..d7d7243a 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index a5cbb475..98614f9c 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 916524a1..3086cb0f 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 1fbadbb7..8f5c0827 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Завершится до", "editCardReceivedDatePopup-title": "Изменить дату получения", "editCardEndDatePopup-title": "Изменить дату завершения" -}
\ No newline at end of file +} diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 22cad5ec..66ffe5a4 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 4ad85e22..e923fdf5 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Ändra mottagningsdatum", "editCardEndDatePopup-title": "Ändra slutdatum" -}
\ No newline at end of file +} diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index ab7c9880..1f46dce6 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index 1118c6db..a4f2d6b4 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index 2389e1c7..3dfecc59 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Bitiş zamanı", "editCardReceivedDatePopup-title": "Giriş tarihini değiştir", "editCardEndDatePopup-title": "Bitiş tarihini değiştir" -}
\ No newline at end of file +} diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index a3266b8d..2552ec4e 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index eb8bada9..5e03eaed 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 059ccf39..37b641e7 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "终止于", "editCardReceivedDatePopup-title": "修改接收日期", "editCardEndDatePopup-title": "修改终止日期" -}
\ No newline at end of file +} diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 251d6344..fa658a5e 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -443,4 +443,4 @@ "card-end-on": "Ends on", "editCardReceivedDatePopup-title": "Change received date", "editCardEndDatePopup-title": "Change end date" -}
\ No newline at end of file +} diff --git a/models/accountSettings.js b/models/accountSettings.js index db4087c0..6dfbac5d 100644 --- a/models/accountSettings.js +++ b/models/accountSettings.js @@ -23,11 +23,17 @@ AccountSettings.allow({ if (Meteor.isServer) { Meteor.startup(() => { - AccountSettings.upsert({ _id: 'accounts-allowEmailChange' }, { + AccountSettings.upsert({_id: 'accounts-allowEmailChange'}, { $setOnInsert: { booleanValue: false, sort: 0, }, }); + AccountSettings.upsert({_id: 'accounts-allowUserNameChange'}, { + $setOnInsert: { + booleanValue: false, + sort: 1, + }, + }); }); } |