projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 17430be)
Use addField in contact_form_domain CRM-16178
authorTim Mallezie <tim.mallezie@chiro.be>
Wed, 29 Apr 2015 15:52:27 +0000 (17:52 +0200)
committerTim Mallezie <tim.mallezie@chiro.be>
Wed, 29 Apr 2015 15:52:27 +0000 (17:52 +0200)
CRM/Contact/Form/Domain.php patch | blob | blame | history
xml/schema/Core/Domain.xml patch | blob | blame | history

diff --git a/CRM/Contact/Form/Domain.php b/CRM/Contact/Form/Domain.php
index d9525d15f909d0fa16dbb4331c39bd67837ebcb1..0ec0030303ea14ea69ed3344c8999a4e011739e8 100644 (file)
--- a/CRM/Contact/Form/Domain.php
+++ b/CRM/Contact/Form/Domain.php
@@ -74,6 +74,20 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
    */
   const LOCATION_BLOCKS = 1;
 
+  /**
+   * Explicitly declare the entity api name.
+   */
+  public function getDefaultEntity() {
+    return 'Domain';
+  }
+
+  /**
+   * Explicitly declare the form context.
+   */
+  public function getDefaultContext() {
+    return 'create';
+  }
+
   public function preProcess() {
     CRM_Utils_System::setTitle(ts('Organization Address and Contact Info'));
     $breadCrumbPath = CRM_Utils_System::url('civicrm/admin', 'reset=1');
@@ -144,12 +158,9 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form {
    * @return void
    */
   public function buildQuickForm() {
-
-    $this->add('text', 'name', ts('Organization Name'), array('size' => 25), TRUE);
-    $this->add('text', 'description', ts('Description'), array('size' => 25));
-
+    $this->addField('name', array('label' => ts('Organization Name')), TRUE);
+    $this->addField('description', array('label' => ts('Description'), 'size' => 30));
     $this->add('text', 'email_name', ts('FROM Name'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_Email', 'email'), TRUE);
-
     $this->add('text', 'email_address', ts('FROM Email Address'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_Email', 'email'), TRUE);
     $this->addRule('email_address', ts('Domain Email Address must use a valid email address format (e.g. \'info@example.org\').'), 'email');
 
diff --git a/xml/schema/Core/Domain.xml b/xml/schema/Core/Domain.xml
index d9ed287d56745a0e09e5a064fdb2d8cadc58e8d3..c3a602031307a7af0ff3a889fc91fd5ec2ee87b1 100644 (file)
--- a/xml/schema/Core/Domain.xml
+++ b/xml/schema/Core/Domain.xml
@@ -25,6 +25,9 @@
     <length>64</length>
     <comment>Name of Domain / Organization</comment>
     <add>1.1</add>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
     <name>description</name>
@@ -33,6 +36,9 @@
     <length>255</length>
     <comment>Description of Domain.</comment>
     <add>1.1</add>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <index>
     <name>UI_name</name>