diff options
| author | Henry <spam@hjkos.com> | 2018-12-05 07:34:27 +0000 |
|---|---|---|
| committer | Henry <spam@hjkos.com> | 2018-12-05 07:34:27 +0000 |
| commit | 914386270796fa2ec460b828710ee31ef870ea69 (patch) | |
| tree | ad2ebf199a5bbe2cf5b3c8c04bdd320f5670b067 /src/components/user_panel | |
| parent | 9591d179f48b90b072e70b4fc475ae1691b96313 (diff) | |
| parent | 5eced8bf09ddd169ba174ece4b790d916cea32d9 (diff) | |
Merge branch 'fix/user-settings-switch' into 'develop'
Switch to "timeline" when pressing user-settings
See merge request pleroma/pleroma-fe!397
Diffstat (limited to 'src/components/user_panel')
| -rw-r--r-- | src/components/user_panel/user_panel.js | 1 | ||||
| -rw-r--r-- | src/components/user_panel/user_panel.vue | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/components/user_panel/user_panel.js b/src/components/user_panel/user_panel.js index 15804b88..eb7cb09c 100644 --- a/src/components/user_panel/user_panel.js +++ b/src/components/user_panel/user_panel.js @@ -3,6 +3,7 @@ import PostStatusForm from '../post_status_form/post_status_form.vue' import UserCardContent from '../user_card_content/user_card_content.vue' const UserPanel = { + props: [ 'activatePanel' ], computed: { user () { return this.$store.state.users.currentUser } }, diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue index 2d5cb500..83eb099f 100644 --- a/src/components/user_panel/user_panel.vue +++ b/src/components/user_panel/user_panel.vue @@ -1,7 +1,7 @@ <template> <div class="user-panel"> <div v-if='user' class="panel panel-default" style="overflow: visible;"> - <user-card-content :user="user" :switcher="false" :hideBio="true"></user-card-content> + <user-card-content :activatePanel="activatePanel" :user="user" :switcher="false" :hideBio="true"></user-card-content> <div class="panel-footer"> <post-status-form v-if='user'></post-status-form> </div> |