From 2183d53ff89f09a1fd3f5493f23529833b0bc5ed Mon Sep 17 00:00:00 2001
From: Jamie Snape <jamie.snape@kitware.com>
Date: Thu, 22 Oct 2015 14:28:53 -0400
Subject: [PATCH] Directly add a user to a community/group

---
 core/controllers/CommunityController.php      | 25 ++++++++++++++++---
 core/public/js/community/community.manage.js  |  5 ++++
 .../js/community/community.selectgroup.js     |  5 +++-
 core/public/js/community/community.view.js    |  5 ++++
 core/views/community/manage.phtml             |  2 +-
 core/views/community/selectgroup.phtml        |  2 +-
 core/views/community/view.phtml               |  5 ++++
 7 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/core/controllers/CommunityController.php b/core/controllers/CommunityController.php
index a7097391c..d0812fb42 100644
--- a/core/controllers/CommunityController.php
+++ b/core/controllers/CommunityController.php
@@ -523,9 +523,28 @@ public function addusertogroupAction()
             $member_group = $community->getMemberGroup();
             $this->Group->addUser($member_group, $user);
             $this->Group->addUser($group, $user);
-            echo JsonComponent::encode(array(true, 'User added.'));
+
+            $email = $user->getEmail();
+            $url = $this->getServerURL().$this->view->webroot;
+            $subject = 'Joined New Community';
+            $body = $this->userSession->Dao->getFullName().' has added you to the <b>'.$community->getName().'</b> community on Midas Platform.<br/><br/><a href="'.$url.'/community/'.$community->getKey().'">Click here</a> to see the community.';
+            $result = Zend_Registry::get('notifier')->callback(
+                'CALLBACK_CORE_SEND_MAIL_MESSAGE',
+                array(
+                    'to' => $email,
+                    'subject' => $subject,
+                    'html' => $body,
+                    'event' => 'community_add_user',
+                )
+            );
+
+            if ($result) {
+                echo JsonComponent::encode(array(true, 'User added and notification sent to '.$email));
+            } else {
+                echo JsonComponent::encode(array(true, 'User added but notification not sent'));
+            }
         } else {
-            echo JsonComponent::encode(array(false, 'Unable to add user.'));
+            echo JsonComponent::encode(array(false, 'Unable to add user'));
         }
     }
 
@@ -604,7 +623,7 @@ public function sendinvitationAction()
                 if ($result) {
                     echo JsonComponent::encode(array(true, 'Invitation sent to '.$email));
                 } else {
-                    echo JsonComponent::encode(array(true, 'Invitation not sent'));
+                    echo JsonComponent::encode(array(true, 'Invitation created but not sent'));
                 }
             }
         } else {
diff --git a/core/public/js/community/community.manage.js b/core/public/js/community/community.manage.js
index b95f60b2c..0ecfb1e7d 100644
--- a/core/public/js/community/community.manage.js
+++ b/core/public/js/community/community.manage.js
@@ -26,6 +26,11 @@ midas.community.manage.init = function () {
 
     $('a#addUserToGroupLink').click(function () {
         midas.loadDialog('invitationCommunity', '/community/invitation?directadd=true&communityId=' + encodeURIComponent(json.community.community_id));
+        midas.showDialog('Add user', false);
+    });
+
+    $('a#inviteUserToGroupLink').click(function () {
+        midas.loadDialog('invitationCommunity', '/community/invitation?communityId=' + encodeURIComponent(json.community.community_id));
         midas.showDialog(json.community.sendInvitation, false);
     });
 
diff --git a/core/public/js/community/community.selectgroup.js b/core/public/js/community/community.selectgroup.js
index 1de5a1890..95288e368 100644
--- a/core/public/js/community/community.selectgroup.js
+++ b/core/public/js/community/community.selectgroup.js
@@ -6,6 +6,9 @@ var midas = midas || {};
 
 $(document).ready(function () {
     'use strict';
+    if (typeof midas.invite.directAdd !== 'undefined' && midas.invite.directAdd == 1) {
+        $('#inviteOrAdd').html('add');
+    }
     $('#groupSelectOk').click(function () {
         var url = json.global.webroot + '/community/sendinvitation';
         var params = {
@@ -21,7 +24,7 @@ $(document).ready(function () {
         if (typeof midas.invite.directAdd !== 'undefined' && midas.invite.directAdd == 1) {
             url = json.global.webroot + '/community/addusertogroup';
         }
-        $.post(json.global.webroot + '/community/sendinvitation', params, function (data) {
+        $.post(url, params, function (data) {
             var jsonResponse = $.parseJSON(data);
             if (jsonResponse[0]) {
                 midas.createNotice(jsonResponse[1], 3000);
diff --git a/core/public/js/community/community.view.js b/core/public/js/community/community.view.js
index 9265cd93b..369e04cb2 100644
--- a/core/public/js/community/community.view.js
+++ b/core/public/js/community/community.view.js
@@ -30,6 +30,11 @@ $(document).ready(function () {
     $('img.tableLoading').hide();
     $('table#browseTable').show();
 
+    $('a#addUserLink').click(function () {
+        midas.loadDialog('invitationCommunity', '/community/invitation?directadd=true&communityId=' + encodeURIComponent(json.community.community_id));
+        midas.showDialog('Add user', false);
+    });
+
     $('a#sendInvitationLink').click(function () {
         midas.loadDialog('invitationCommunity', '/community/invitation?communityId=' + encodeURIComponent(json.community.community_id));
         midas.showDialog(json.community.sendInvitation, false);
diff --git a/core/views/community/manage.phtml b/core/views/community/manage.phtml
index b98825884..0f390b040 100644
--- a/core/views/community/manage.phtml
+++ b/core/views/community/manage.phtml
@@ -287,7 +287,7 @@ if ($this->isAdmin) {
                 ?>
             </div>
             <hr>
-            <a href="javascript:;" id='createGroupLink'> <?php echo $this->t('Create a new group') ?></a>, , <a href="javascript:;" id='addUserToGroupLink'> <?php echo $this->t('Add user to group') ?></a>
+            <a href="javascript:;" id='createGroupLink'> <?php echo $this->t('Create a new group') ?></a>, <a href="javascript:;" id='addUserToGroupLink'> <?php echo $this->t('Add user to group') ?></a>, <a href="javascript:;" id='inviteUserToGroupLink'> <?php echo $this->t('Invite user to group') ?></a>
 
             <div style="display:none;" id='createGroupFrom'>
                 <form class="editGroupForm genericForm" method="<?php echo $this->createGroupForm['method'] ?>"
diff --git a/core/views/community/selectgroup.phtml b/core/views/community/selectgroup.phtml
index 29d902fe0..f0f5f11db 100644
--- a/core/views/community/selectgroup.phtml
+++ b/core/views/community/selectgroup.phtml
@@ -24,7 +24,7 @@
       href="<?php echo $this->coreWebroot ?>/public/css/community/community.selectgroup.css"/>
 
 <div class="groupSelectContainer">
-    Which community group would you like to invite the user to?
+    Which community group would you like to <span id="inviteOrAdd">invite</span> the user to?
     <div>
         <select id="groupSelect">
             <?php
diff --git a/core/views/community/view.phtml b/core/views/community/view.phtml
index 49b0206cb..18652f756 100644
--- a/core/views/community/view.phtml
+++ b/core/views/community/view.phtml
@@ -206,6 +206,11 @@ $strippedDescription = strip_tags($description);
                 ))}'><img alt='' src='{$this->coreWebroot}/public/images/icons/edit.png'/> {$this->t('Manage')}</a></li>
           ";
                 echo "
+          <li><a id='addUserLink'><img alt='' src='{$this->coreWebroot}/public/images/icons/add.png'/> {$this->t(
+                    'Add user'
+                )}</a></li>
+          ";
+                echo "
           <li><a id='sendInvitationLink'><img alt='' src='{$this->coreWebroot}/public/images/icons/email.png'/> {$this->t(
                     'Send invitation'
                 )}</a></li>