projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d6ec153 3cbb42f)
Merge in 5.31
authorSeamus Lee <seamuslee001@gmail.com>
Thu, 5 Nov 2020 22:45:31 +0000 (09:45 +1100)
committerSeamus Lee <seamuslee001@gmail.com>
Thu, 5 Nov 2020 22:45:31 +0000 (09:45 +1100)
1  2 
CRM/Contact/DAO/Group.php patch | diff1 | diff2 | blob | history
xml/schema/Contact/Group.xml patch | diff1 | diff2 | blob | history

diff --combined CRM/Contact/DAO/Group.php
index ff7e1c8beb51bf0c0a6614e18faa9720bd27be44,d0d027ed2ea68d04b30a4a58d7debba7f07efb35..b126c0e9fdd09e20655366d0f9562b98b7bf69a5
--- 1/CRM/Contact/DAO/Group.php
--- 2/CRM/Contact/DAO/Group.php
+++ b/CRM/Contact/DAO/Group.php
@@@ -6,7 -6,7 +6,7 @@@
   *
   * Generated from xml/schema/CRM/Contact/Group.xml
   * DO NOT EDIT.  Generated by CRM_Core_CodeGen
-  * (GenCodeChecksum:49027c63bf6fd142e79220b39f84056d)
 - * (GenCodeChecksum:cab0c1d345870ec17420e9100fe2518f)
++ * (GenCodeChecksum:e40e779ac8e9bec5ea4d6c55f6f3b863)
   */
  
  /**
@@@ -37,15 -37,6 +37,15 @@@ class CRM_Contact_DAO_Group extends CRM
     */
    public static $_log = TRUE;
  
 +  /**
 +   * Paths for accessing this entity in the UI.
 +   *
 +   * @var string[]
 +   */
 +  protected static $_paths = [
 +    'add' => 'civicrm/group/add?reset=1',
 +  ];
 +
    /**
     * Group ID
     *
@@@ -273,7 -264,6 +273,6 @@@
            'type' => CRM_Utils_Type::T_STRING,
            'title' => ts('Group Title'),
            'description' => ts('Name of Group.'),
-           'required' => TRUE,
            'maxlength' => 255,
            'size' => CRM_Utils_Type::HUGE,
            'where' => 'civicrm_group.title',
diff --combined xml/schema/Contact/Group.xml
index 4121891f93e62a3a99879332461e93fbf77c1073,d726af3758b78b90ec5878f8a3ebf205dcc9f189..41948bbb39bd88ee3bcf1f749ffd505672c41b38
--- 1/xml/schema/Contact/Group.xml
--- 2/xml/schema/Contact/Group.xml
+++ b/xml/schema/Contact/Group.xml
@@@ -8,9 -8,6 +8,9 @@@
    <add>1.1</add>
    <log>true</log>
    <icon>fa-users</icon>
 +  <paths>
 +    <add>civicrm/group/add?reset=1</add>
 +  </paths>
    <field>
      <name>id</name>
      <type>int unsigned</type>
@@@ -37,7 -34,6 +37,6 @@@
      <title>Group Title</title>
      <length>255</length>
      <localizable>true</localizable>
-     <required>true</required>
      <comment>Name of Group.</comment>
      <add>1.1</add>
      <html>