Browse Source

Sync Account Policy (#46)

Merge branch 'master' into kris/sync_account_plan

Fix UI to properly show account.sync flag

Rename sync password to sync account

Co-authored-by: Kristijan Mitrovic <kmitrovic@itekako.com>
Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/46
pull/48/head
Kristijan Mitrovic 4 years ago
committed by jonathan
parent
commit
2d0df5ecd8
3 changed files with 14 additions and 12 deletions
  1. +1
    -1
      src/_pages/main/Layout.vue
  2. +5
    -5
      src/account/NewNetworkPage.vue
  3. +8
    -6
      src/account/profile/ProfilePage.vue

+ 1
- 1
src/_pages/main/Layout.vue View File

@@ -26,7 +26,7 @@ export default {
},
sshKey: '',
forkHost: '',
syncPassword: true,
syncAccount: true,
launchLock: false,
sendErrors: true,
sendMetrics: true,


+ 5
- 5
src/account/NewNetworkPage.vue View File

@@ -277,10 +277,10 @@

<!-- sync password -->
<!-- <div class="form-group">-->
<!-- <label for="syncPassword">{{messages.field_label_sync_password}}</label>-->
<!-- <input type="checkbox" id="syncPassword" v-model="accountPlan.syncPassword">-->
<!-- <div v-if="submitted && errors.has('syncPassword')" class="invalid-feedback d-block">{{ errors.first('syncPassword') }}</div>-->
<!-- <p>{{messages.field_label_sync_password_description}}</p>-->
<!-- <label for="syncAccount">{{messages.field_label_sync_account}}</label>-->
<!-- <input type="checkbox" id="syncAccount" v-model="accountPlan.syncAccount">-->
<!-- <div v-if="submitted && errors.has('syncAccount')" class="invalid-feedback d-block">{{ errors.first('syncAccount') }}</div>-->
<!-- <p>{{messages.field_label_sync_account_description}}</p>-->
<!-- </div>-->
<!-- launch lock -->
<!-- <div class="form-group" v-if="networkType !== 'fork'">-->
@@ -393,7 +393,7 @@
},
sshKey: '',
forkHost: '',
syncPassword: true,
syncAccount: true,
launchLock: false,
sendErrors: true,
sendMetrics: true


+ 8
- 6
src/account/profile/ProfilePage.vue View File

@@ -79,10 +79,12 @@

<!-- sync password -->
<div v-if="admin === true && currentUser.uuid === subject.uuid" class="form-group">
<label for="syncPassword">{{messages.field_label_sync_password}}</label>
<input type="checkbox" id="syncPassword" v-model="subject.syncPassword">
<div v-if="submitted && errors.has('syncPassword')" class="invalid-feedback d-block">{{ errors.first('syncPassword') }}</div>
<p>{{messages.field_label_sync_password_description}}</p>
<label for="sync">{{ messages.field_label_sync_account }}</label>
<input type="checkbox" id="sync" v-model="subject.sync">
<div v-if="submitted && errors.has('sync')" class="invalid-feedback d-block">
{{ errors.first('sync') }}
</div>
<p>{{ messages.field_label_sync_account_description }}</p>
</div>

<div>
@@ -119,7 +121,7 @@
locale: null,
admin: null,
suspended: null,
syncPassword: null,
sync: null,
showBlockStats: null,
autoUpdatePolicy: {
jarUpdates: true,
@@ -204,7 +206,7 @@
locale: this.subject.locale,
admin: this.subject.admin,
suspended: this.subject.suspended,
syncPassword: this.subject.syncPassword,
sync: this.subject.sync,
autoUpdatePolicy: this.subject.autoUpdatePolicy
};
this.submitted = true;


Loading…
Cancel
Save