From 4a6798243d48422b28b8d73855b1c4e101a7df8b Mon Sep 17 00:00:00 2001
From: atif-shaikh <shaikh388@gmail.com>
Date: Thu, 18 Dec 2014 20:16:00 +0530
Subject: [PATCH] CRM-15729 - Contact batch update via profile removes group
 contacts

https://issues.civicrm.org/jira/browse/CRM-15729
---
 CRM/Contact/Form/Edit/TagsAndGroups.php       |  2 +-
 CRM/Contact/Form/Task/Batch.php               |  2 +-
 .../CRM/Contact/Form/Edit/TagsAndGroups.tpl   | 31 +++++++++++--------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CRM/Contact/Form/Edit/TagsAndGroups.php b/CRM/Contact/Form/Edit/TagsAndGroups.php
index b29fa733df..d7b91d266e 100644
--- a/CRM/Contact/Form/Edit/TagsAndGroups.php
+++ b/CRM/Contact/Form/Edit/TagsAndGroups.php
@@ -177,7 +177,7 @@ class CRM_Contact_Form_Edit_TagsAndGroups {
     }
     $form->assign('tagGroup', $form->_tagGroup);
   }
-  
+
   static function climbtree($form, $tree, &$elements) {
     foreach ($tree as $tagID => $varValue) {
       $tagAttribute = array(
diff --git a/CRM/Contact/Form/Task/Batch.php b/CRM/Contact/Form/Task/Batch.php
index 0b994af973..5174dead70 100644
--- a/CRM/Contact/Form/Task/Batch.php
+++ b/CRM/Contact/Form/Task/Batch.php
@@ -252,7 +252,7 @@ class CRM_Contact_Form_Task_Batch extends CRM_Contact_Form_Task {
       //parse street address, CRM-7768
       self::parseStreetAddress($value, $this);
 
-      CRM_Contact_BAO_Contact::createProfileContact($value, $this->_fields, $key, NULL, $ufGroupId);
+      CRM_Contact_BAO_Contact::createProfileContact($value, $this->_fields, $key, NULL, $ufGroupId, NULL, TRUE);
       if ($notify) {
         $values = CRM_Core_BAO_UFGroup::checkFieldsEmptyValues($ufGroupId, $key, NULL);
         CRM_Core_BAO_UFGroup::commonSendMail($key, $values);
diff --git a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index bc40ef11a3..c939c35e1c 100644
--- a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -37,7 +37,7 @@
 </style>
 <script type="text/javascript">
   (function($, _){{/literal}
-    var entityID={$entityID},
+    var entityID='{$entityID}',
       entityTable='{$entityTable}',
       $form = $('form.{$form.formClass}');
     {literal}
@@ -67,9 +67,9 @@
           "url": CRM.config.resourceBase + 'packages/jquery/plugins/jstree/themes/classic/style.css'
         }
       });
-	  
+
 	  {/literal}
-      {if $permission neq 'edit'}
+      {if !empty($permission) && $permission neq 'edit'}
         {literal}
           $("#tagtree input").prop('disabled', true);
         {/literal}
@@ -87,19 +87,24 @@
 {/if}
     <table class="form-layout-compressed{if $context EQ 'profile'} crm-profile-tagsandgroups{/if}">
       <tr>
-       {if $groupElementType eq 'select'}
-          <td><span class="label">{if $title}{$form.group.label}{/if}</span>
+        {if !$type || $type eq 'group'}
+          <td>
+            {if $groupElementType eq 'select'}
+              <span class="label">{if $title}{$form.group.label}{/if}</span>
+            {/if}
             {$form.group.html}
           </td>
-      {/if}
-      
-	  <td width="70%"><span class="label">{if $title}{$form.$key.label}{/if}</span>
-		<div id="tagtree">
-			{include file="CRM/Contact/Form/Edit/Tagtree.tpl" level=1}
-		</div>
-	  </td>
-    </tr>
+        {/if}
+      </tr>
+
     {if !$type || $type eq 'tag'}
+      <tr>
+        <td width="70%"><span class="label">{if $title}{$form.$key.label}{/if}</span>
+          <div id="tagtree">
+            {include file="CRM/Contact/Form/Edit/Tagtree.tpl" level=1}
+          </div>
+        </td>
+      </tr>
       <tr><td>{include file="CRM/common/Tagset.tpl"}</td></tr>
     {/if}
   </table>
-- 
2.25.1