sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-04 04:59:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4757 from crookedneighbor/guild-button

Browse source 
Guild button
This commit is contained in:
Blade Barringer 2015-02-25 17:28:39 -06:00
commit 13c7804f64
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
website/src/controllers/groups.js
View file

@ -81,6 +81,7 @@ api.list = function(req, res, next) {
Group.find({privacy: 'public'})
.select(groupFields + ' members')
.sort(sort)
.lean()
.exec(function(err, groups){
if (err) return cb(err);
_.each(groups, function(g){

6
website/views/options/social/group.jade
View file

@ -17,6 +17,8 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
.panel-heading(bindonce='group')
h3.panel-title
| {{group.name}}
span(ng-if='group')
a.btn.btn-success.pull-right(ng-if=':: !isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join')
span(ng-if='group.leader == user.id')
button.btn.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing')=env.t('save')
button.btn.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing')=env.t('editGroup')
@ -100,7 +102,9 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
span(ng-click='clickMember(invite._id, true)')
| {{invite.profile.name}}
a.btn.btn-danger(data-id='{{group.id}}', ng-click='clickLeave(group, $event)')=env.t('leave')
div(ng-if="group")
a.btn.btn-danger(ng-if=':: isMemberOfGroup(User.user._id, group)', data-id='{{group.id}}', ng-click='clickLeave(group, $event)')=env.t('leave')
a.btn.btn-success(ng-if=':: !isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join')
.col-md-8
div()