mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-08-01 11:40:25 +00:00
sometimes model.session.userId is available, sometimes
model.get('_userId'). *sigh*
This commit is contained in:
parent
2169cc6740
commit
fbeaabc7c0
2 changed files with 5 additions and 7 deletions
|
|
@ -38,9 +38,9 @@ get '/', (page, model, next) ->
|
|||
|
||||
# This used to be in party.server(model, cb), but was getting `TypeError: Object #<Model> has no method 'server'`
|
||||
# on the second load for some reason
|
||||
selfQ = model.query('users').withId(model.get('_userId'))
|
||||
selfQ = model.query('users').withId(model.get('_userId') or model.session.userId)
|
||||
model.subscribe selfQ, (err, users) ->
|
||||
console.log err if err
|
||||
throw err if err
|
||||
|
||||
user = users.at(0)
|
||||
model.ref '_user', user
|
||||
|
|
@ -65,11 +65,10 @@ get '/', (page, model, next) ->
|
|||
setupModelFns(model)
|
||||
|
||||
if obj.party?.current?
|
||||
console.log obj.party.current
|
||||
console.log err if err
|
||||
throw err if err
|
||||
partiesQ = model.query('parties').withId(obj.party.current)
|
||||
model.subscribe partiesQ, (err, parties) ->
|
||||
console.log err if err
|
||||
throw err if err
|
||||
party = parties.at(0)
|
||||
model.ref '_party', party
|
||||
membersQ = model.query('users').party(parties.at(0).get('members'))
|
||||
|
|
|
|||
|
|
@ -119,8 +119,7 @@
|
|||
</h2>
|
||||
|
||||
{#if _user.party.current}
|
||||
<!-- In a party -->
|
||||
<table class="table table-stripe">
|
||||
<table class="table table-striped">
|
||||
{#each _partyMembers as :member}
|
||||
<tr><td>{username(:member.auth)}</td><td>({:member.id})</td></tr>
|
||||
{/}
|
||||
|
|
|
|||
Loading…
Reference in a new issue