Merge pull request #1824 from dlobo/CRM-13577

[civicrm-core.git] / CRM / Contact / Form / Contact.php

diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php
index 00fe65e9a43e491ecead694855c76e9728b53aac..000931f50e36e4f7de5fc130106ea312020fadb7 100644 (file)
--- a/CRM/Contact/Form/Contact.php
+++ b/CRM/Contact/Form/Contact.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -206,9 +206,7 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form {
 
         // check for permissions
         $session = CRM_Core_Session::singleton();
-        if ($session->get('userID') != $this->_contactId &&
-          !CRM_Contact_BAO_Contact_Permission::allow($this->_contactId, CRM_Core_Permission::EDIT)
-        ) {
+        if (!CRM_Contact_BAO_Contact_Permission::allow($this->_contactId, CRM_Core_Permission::EDIT)) {
           CRM_Core_Error::statusBounce(ts('You do not have the necessary permission to edit this contact.'));
         }
 
@@ -404,7 +402,7 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form {
       if (array_key_exists('TagsAndGroups', $this->_editOptions)) {
         // set group and tag defaults if any
         if ($this->_gid) {
-          $defaults['group'][$this->_gid] = 1;
+          $defaults['group'][] = $this->_gid;
         }
         if ($this->_tid) {
           $defaults['tag'][$this->_tid] = 1;
@@ -593,7 +591,7 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form {
     }
 
     if (array_key_exists('Address', $this->_editOptions)) {
-      $this->addFormRule(array('CRM_Contact_Form_Edit_Address', 'formRule'));
+      $this->addFormRule(array('CRM_Contact_Form_Edit_Address', 'formRule'), $this);
     }
 
     if (array_key_exists('CommunicationPreferences', $this->_editOptions)) {
@@ -799,10 +797,17 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form {
         $this->_blocks['Address'] = $this->_editOptions['Address'];
         continue;
       }
+      if ($name == 'TagsAndGroups') {
+        continue;
+      }
       $className = 'CRM_Contact_Form_Edit_' . $name;
       $className::buildQuickForm($this);
     }
 
+    // build tags and groups
+    CRM_Contact_Form_Edit_TagsAndGroups::buildQuickForm($this, 0, CRM_Contact_Form_Edit_TagsAndGroups::ALL,
+      FALSE, NULL, 'Group(s)', 'Tag(s)', NULL, 'crmasmSelect');
+
     // build location blocks.
     CRM_Contact_Form_Edit_Lock::buildQuickForm($this);
     CRM_Contact_Form_Location::buildQuickForm($this);
@@ -871,6 +876,14 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form {
     //get the submitted values in an array
     $params = $this->controller->exportValues($this->_name);
 
+    $group = CRM_Utils_Array::value('group', $params);
+    if ($group && is_array($group)) {
+      unset($params['group']);
+      foreach ($group as $key => $value) {
+        $params['group'][$value] = 1;
+      }
+    }
+
     CRM_Contact_BAO_Contact_Optimizer::edit( $params, $this->_preEditValues );
 
     if (CRM_Utils_Array::value('image_URL', $params)) {
@@ -959,15 +972,13 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form {
 
     if (CRM_Utils_Array::value('contact_id', $params) && ($this->_action & CRM_Core_Action::UPDATE)) {
       // figure out which all groups are intended to be removed
-      if (!empty($params['group'])) {
-        $contactGroupList = CRM_Contact_BAO_GroupContact::getContactGroup($params['contact_id'], 'Added');
-        if (is_array($contactGroupList)) {
-          foreach ($contactGroupList as $key) {
-            if ($params['group'][$key['group_id']] != 1 &&
-              !CRM_Utils_Array::value('is_hidden', $key)
-            ) {
-              $params['group'][$key['group_id']] = -1;
-            }
+      $contactGroupList = CRM_Contact_BAO_GroupContact::getContactGroup($params['contact_id'], 'Added');
+      if (is_array($contactGroupList)) {
+        foreach ($contactGroupList as $key) {
+          if ((!array_key_exists($key['group_id'], $params['group']) || $params['group'][$key['group_id']] != 1)
+            && !CRM_Utils_Array::value('is_hidden', $key)
+          ) {
+            $params['group'][$key['group_id']] = -1;
           }
         }
       }