From 6af71f0e44dcea27bcbde1d33236e34e5e42e5a3 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Tue, 29 Oct 2013 16:50:28 +0100
Subject: [PATCH] better group invite handling

---
 public/js/controllers/groupsCtrl.js | 9 +++++----
 src/controllers/groups.js           | 2 +-
 views/options/groups/group.jade     | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js
index 8815c3bec0..890c625892 100644
--- a/public/js/controllers/groupsCtrl.js
+++ b/public/js/controllers/groupsCtrl.js
@@ -59,11 +59,12 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
 
     // ------ Invites ------
 
-      $scope.invitee = '';
-      $scope.invite = function(group, uuid){
-        group.$invite({uuid:uuid}, function(){
-          $scope.invitee = '';
+      $scope.invite = function(group){
+        group.$invite({uuid:group.invitee}, function(){
+          group.invitee = '';
           alert("User invited to group");
+        }, function(){
+          group.invitee = '';
         });
       }
     }
diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index a6e9764479..bafd4e015d 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -278,7 +278,7 @@ api.invite = function(req, res, next) {
   User.findById(uuid, function(err,invite){
     if (err) return res.json(500,{err:err});
     if (!invite)
-       return res.json(400,{err:'User with id '+req.query.uid+' not found'});
+       return res.json(400,{err:'User with id "' + uuid + '" not found'});
     if (group.type == 'guild') {
       if (_.contains(group.members,uuid))
         return res.json(400,{err: "User already in that group"});
diff --git a/views/options/groups/group.jade b/views/options/groups/group.jade
index acd2b9ce22..283fcacb26 100644
--- a/views/options/groups/group.jade
+++ b/views/options/groups/group.jade
@@ -66,10 +66,10 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
                   | {{username(member.auth, member.profile.name)}}
             td ({{member._id}})
       .modal-footer.whatever-options
-        form.form-inline(ng-submit='invite(group, invitee)')
+        form.form-inline(ng-submit='invite(group)')
           //.alert.alert-danger(ng-show='_groupError') {{_groupError}}
           .control-group.option-large
-            input.option-content(type='text', placeholder='User Id', ng-model='invitee')
+            input.option-content(type='text', placeholder='User Id', ng-model='group.invitee')
             input.btn(type='submit', value='Invite')