therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'feature/split-hide-network' into 'develop'"

Browse source 
This reverts merge request !497
This commit is contained in:
Shpuld Shpludson 2019-02-03 14:32:23 +00:00
parent c7ee2ed831
commit d4991d0162
9 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/user_settings/user_settings.js
View file

@ -10,8 +10,7 @@ const UserSettings = {
newLocked: this.$store.state.users.currentUser.locked,
newNoRichText: this.$store.state.users.currentUser.no_rich_text,
newDefaultScope: this.$store.state.users.currentUser.default_scope,
hideFollowings: this.$store.state.users.currentUser.hide_followings,
hideFollowers: this.$store.state.users.currentUser.hide_followers,
newHideNetwork: this.$store.state.users.currentUser.hide_network,
followList: null,
followImportError: false,
followsImported: false,
@ -67,8 +66,7 @@ const UserSettings = {
/* eslint-disable camelcase */
const default_scope = this.newDefaultScope
const no_rich_text = this.newNoRichText
const hide_followings = this.hideFollowings
const hide_followers = this.hideFollowers
const hide_network = this.newHideNetwork
/* eslint-enable camelcase */
this.$store.state.api.backendInteractor
.updateProfile({
@ -80,8 +78,7 @@ const UserSettings = {
/* eslint-disable camelcase */
default_scope,
no_rich_text,
hide_followings,
hide_followers
hide_network
/* eslint-enable camelcase */
}}).then((user) => {
if (!user.error) {

8
src/components/user_settings/user_settings.vue
View file

@ -30,12 +30,8 @@
<label for="account-no-rich-text">{{$t('settings.no_rich_text_description')}}</label>
</p>
<p>
<input type="checkbox" v-model="hideFollowings" id="account-hide-followings">
<label for="account-hide-followings">{{$t('settings.hide_followings_description')}}</label>
</p>
<p>
<input type="checkbox" v-model="hideFollowers" id="account-hide-followers">
<label for="account-hide-followers">{{$t('settings.hide_followers_description')}}</label>
<input type="checkbox" v-model="newHideNetwork" id="account-hide-network">
<label for="account-hide-network">{{$t('settings.hide_network_description')}}</label>
</p>
<button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
</div>