add hidden support to addField, convert Edit_Lock and Inline_Lock

diff --git a/CRM/Contact/Form/Edit/Lock.php b/CRM/Contact/Form/Edit/Lock.php
index 476b1e0b6b00436360f448b31cc99c7a0135c28c..7663c3aec4d28dc6831fc5971f7fbc2eea37e7c9 100644 (file)
--- a/CRM/Contact/Form/Edit/Lock.php
+++ b/CRM/Contact/Form/Edit/Lock.php
@@ -48,7 +48,7 @@ class CRM_Contact_Form_Edit_Lock {
    * @return void
    */
   public static function buildQuickForm(&$form) {
-    $form->addElement('hidden', 'modified_date', '', array('id' => 'modified_date'));
+    $form->addField('modified_date', array('type' => 'hidden', 'id' => 'modified_date', 'label' => ''));
   }
 
   /**

diff --git a/CRM/Contact/Form/Inline.php b/CRM/Contact/Form/Inline.php
index 1241396a8aeb11705762f9011faf5635b5666d13..fa6d559941a8a27ddcd4c0215c9f00e2ff6af615 100644 (file)
--- a/CRM/Contact/Form/Inline.php
+++ b/CRM/Contact/Form/Inline.php
@@ -53,6 +53,20 @@ abstract class CRM_Contact_Form_Inline extends CRM_Core_Form {
    */
   public $_contactSubType;
 
+  /**
+   * Explicitly declare the form context.
+   */
+  public function getDefaultContext() {
+    return 'create';
+  }
+
+  /**
+   * Explicitly declare the entity api name.
+   */
+  public function getDefaultEntity() {
+    return 'Contact';
+  }
+
   /**
    * Common preprocess: fetch contact ID and contact type
    */

diff --git a/CRM/Contact/Form/Inline/Lock.php b/CRM/Contact/Form/Inline/Lock.php
index b963f823d065fe15df9152435966eba871b1502b..8450ea08a303056cd0f979649e1c1fee013aba83 100644 (file)
--- a/CRM/Contact/Form/Inline/Lock.php
+++ b/CRM/Contact/Form/Inline/Lock.php
@@ -58,7 +58,7 @@ class CRM_Contact_Form_Inline_Lock {
     // - V1:open E1:open E1:submit V1.email:open V1.email:submit
     // - V1:open V1.email:open E1:open E1:submit V1.email:submit V1:lock
     $timestamps = CRM_Contact_BAO_Contact::getTimestamps($contactID);
-    $form->addElement('hidden', 'oplock_ts', $timestamps['modified_date'], array('id' => 'oplock_ts'));
+    $form->addField('oplock_ts', array('type' => 'hidden', 'id' => 'oplock_ts', 'label' => $timestamps['modified_date']));
     $form->addFormRule(array('CRM_Contact_Form_Inline_Lock', 'formRule'), $contactID);
   }
 

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 29ecb9b8245163ac40d40eafe2167f3034219de0..4b1018f3e5eb0e3667b74c3e0e9be7e33085205d 100644 (file)
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -1222,6 +1222,10 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
         $this->addElement('text', $name, $label, $props, $required);
         break;
 
+      case 'hidden':
+        $this->addElement('hidden', $name, $label, $props);
+        break;
+
       //case 'TextArea':
       //case 'Select Date':
       //TODO: Add date formats