krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

start working on kick from group email & message

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-03-16 19:42:03 +01:00
parent 6d163ecb5d
commit 0722a17897
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/locales/en/groups.json
View File

@@ -59,6 +59,8 @@
"guild": "Guild", "guild": "Guild",
"guilds": "Guilds", "guilds": "Guilds",
"sureKick": "Do you really want to remove this member from the party/guild?", "sureKick": "Do you really want to remove this member from the party/guild?",
"optionalMessage": "Optional message",
"yesRemove": "Yes, remove them",
"foreverAlone": "Can't like your own message. Don't be that person.", "foreverAlone": "Can't like your own message. Don't be that person.",
"sortLevel": "Sort by level", "sortLevel": "Sort by level",
"sortRandom": "Sort randomly", "sortRandom": "Sort randomly",

5
website/public/js/controllers/groupsCtrl.js
View File

@@ -59,7 +59,8 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
} }
$scope.removeMember = function(group, member, isMember){ $scope.removeMember = function(group, member, isMember){
var yes = confirm(window.env.t('sureKick')) $rootScope.openModal('remove-member');
/*var yes = confirm(window.env.t('sureKick'))
if(yes){ if(yes){
Groups.Group.removeMember({gid: group._id, uuid: member._id }, undefined, function(){ Groups.Group.removeMember({gid: group._id, uuid: member._id }, undefined, function(){
if(isMember){ if(isMember){
@@ -68,7 +69,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
_.pull(group.invites, member); _.pull(group.invites, member);
} }
}); });
} }*/
} }
$scope.openInviteModal = function(group){ $scope.openInviteModal = function(group){

9
website/views/shared/modals/members.jade
View File

@@ -101,3 +101,12 @@ script(type='text/ng-template', id='modals/abuse-flag.html')
| Reset Flag Count | Reset Flag Count
button.btn.btn-primary(ng-click='$close()')=env.t('cancel') button.btn.btn-primary(ng-click='$close()')=env.t('cancel')
button.btn.btn-default(ng-click='reportAbuse(user, abuseObject, groupId)')=env.t("abuseFlagModalButton") button.btn.btn-default(ng-click='reportAbuse(user, abuseObject, groupId)')=env.t("abuseFlagModalButton")
script(type='text/ng-template', id='modals/remove-member.html')
.modal-header
h4=env.t('sureKick')
.modal-body
textarea.form-control(type='text',rows='5', placeholder=env.t('optionalMessage'))
.modal-footer
button.pull-left.btn.btn-danger(ng-click='')=env.t('yesRemove')
button.btn.btn-default(ng-click='$close()')=env.t('cancel')