mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-03 08:21:07 +00:00
groups: some join / leave bug fixes
This commit is contained in:
parent
8a1aae37a8
commit
ad2b37fe50
2 changed files with 12 additions and 10 deletions
|
|
@ -72,7 +72,7 @@ module.exports.app = (appExports, model, app) ->
|
|||
joinGroup = (gid) ->
|
||||
model.push("groups.#{gid}.members", user.get('id'), ->location.reload())
|
||||
|
||||
appExports.joingGroup = (e, el) -> joinGroup e.get('id')
|
||||
appExports.joinGroup = (e, el) -> joinGroup e.get('id')
|
||||
|
||||
appExports.acceptInvitation = (e,el) ->
|
||||
gid = e.get('id')
|
||||
|
|
@ -89,13 +89,12 @@ module.exports.app = (appExports, model, app) ->
|
|||
|
||||
appExports.groupLeave = (e,el) ->
|
||||
group = model.at "groups.#{$(el).attr('data-id')}"
|
||||
members = group.get('members')
|
||||
index = members.indexOf(user.get('id'))
|
||||
group.remove 'members', index, 1, ->
|
||||
if members.length is 1 # # last member out, kill the party
|
||||
group.del ->location.reload()
|
||||
else
|
||||
location.reload()
|
||||
index = group.get('members').indexOf(user.get('id'))
|
||||
if index != -1
|
||||
group.remove 'members', index, 1, ->
|
||||
if _.isEmpty group.get('members') # last member out, delete the party
|
||||
group.del ->location.reload()
|
||||
else location.reload()
|
||||
|
||||
###
|
||||
Chat Functionality
|
||||
|
|
|
|||
|
|
@ -70,8 +70,11 @@
|
|||
<li>{{count(:public.members)}} member(s)</li>
|
||||
<li>
|
||||
<!-- join / leave -->
|
||||
<a x-bind="click:publicLeave" data-id={{:public.id}} class='btn btn-small btn-danger {#if indexOf(:public.members,@user.id)}hidden{/}'><i class='icon-ban-circle'></i> Leave</a>
|
||||
<a x-bind="click:joinGroup" class='btn btn-small btn-success {#unless indexOf(:public.members,@user.id)}hidden{/}'><i class='icon-ok'></i> Join</a>
|
||||
{{#if indexOf(:public.members,_user.id)}}
|
||||
<a x-bind="click:groupLeave" data-id={{:public.id}} class='btn btn-small btn-danger'><i class='icon-ban-circle'></i> Leave</a>
|
||||
{{else}}
|
||||
<a x-bind="click:joinGroup" class='btn btn-small btn-success'><i class='icon-ok'></i> Join</a>
|
||||
{{/}}
|
||||
</li>
|
||||
</ul>
|
||||
<a class="accordion-toggle" data-toggle="collapse" data-parent="#public-guilds-accordion" href="#public-guilds-accordion-{{:public.id}}">
|
||||
|
|
|
|||
Loading…
Reference in a new issue