taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[backport] Broken add new members

stable
xaviju 2017-03-13 17:23:47 +01:00
parent 0562485db9
commit f6db09363c
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/modules/invite-members/lightbox-add-members.jade
View File

@ -4,6 +4,7 @@ tg-lightbox-close
tg-suggest-add-members( tg-suggest-add-members(
ng-show="!vm.displayContactList" ng-show="!vm.displayContactList"
contacts="vm.contacts" contacts="vm.contacts"
filtered-contacts="vm.contacts.slice(0,12)"
on-invite-suggested="vm.inviteSuggested(contact)" on-invite-suggested="vm.inviteSuggested(contact)"
on-invite-email="vm.inviteEmail(email)" on-invite-email="vm.inviteEmail(email)"
) )

2
app/modules/invite-members/suggest-add-members/suggest-add-members.controller.coffee
View File

@ -31,7 +31,7 @@ class SuggestAddMembersController
filterContacts: () -> filterContacts: () ->
@.filteredContacts = @.contacts.filter( (contact) => @.filteredContacts = @.contacts.filter( (contact) =>
contact.get('full_name_display').toLowerCase().includes(@.contactQuery.toLowerCase()) || contact.get('username').toLowerCase().includes(@.contactQuery.toLowerCase()); contact.get('full_name_display').toLowerCase().includes(@.contactQuery.toLowerCase()) || contact.get('username').toLowerCase().includes(@.contactQuery.toLowerCase());
) ).slice(0,12)
setInvited: (contact) -> setInvited: (contact) ->
@.onInviteSuggested({'contact': contact}) @.onInviteSuggested({'contact': contact})

3
app/modules/invite-members/suggest-add-members/suggest-add-members.directive.coffee
View File

@ -18,6 +18,7 @@
### ###
SuggestAddMembersDirective = (lightboxService) -> SuggestAddMembersDirective = (lightboxService) ->
return { return {
scope: {}, scope: {},
templateUrl:"invite-members/suggest-add-members/suggest-add-members.html", templateUrl:"invite-members/suggest-add-members/suggest-add-members.html",
@ -25,7 +26,7 @@ SuggestAddMembersDirective = (lightboxService) ->
controllerAs: "vm", controllerAs: "vm",
bindToController: { bindToController: {
contacts: '=', contacts: '=',
filteredContacts: '<contacts', filteredContacts: '<',
onInviteSuggested: '&', onInviteSuggested: '&',
onInviteEmail: '&' onInviteEmail: '&'
} }

6
app/modules/invite-members/suggest-add-members/suggest-add-members.jade
View File

@ -21,11 +21,11 @@
ul.add-member-suggest-list ul.add-member-suggest-list
li.add-member-suggest-single.e2e-add-member-suggest-single( li.add-member-suggest-single.e2e-add-member-suggest-single(
ng-repeat="contact in vm.filteredContacts | toMutable | limitTo: 12 | orderBy:'full_name_display'" tg-repeat="contact in vm.filteredContacts"
ng-click="vm.setInvited(contact)" ng-click="vm.setInvited(contact)"
) )
img.add-member-suggest-avatar( img.add-member-suggest-avatar(
tg-avatar="contact" tg-avatar="contact"
alt="{{contact.full_name_display}}" alt="{{contact.get('full_name_display')}}"
) )
span.add-member-suggest-name {{contact.full_name_display}} span.add-member-suggest-name {{contact.get('full_name_display')}}