Merge pull request #22893 from demeritcowboy/grant-reports

#3100 - Remove grant leftovers from core xml. Remove empty grant reports menu.

CRM/Upgrade/Incremental/php/FiveFortySeven.php

@@ -83,6 +83,16 @@ class CRM_Upgrade_Incremental_php_FiveFortySeven extends CRM_Upgrade_Incremental
     }
   }
 
+  /**
+   * Upgrade step; adds tasks including 'runSql'.
+   *
+   * @param string $rev
+   *   The version number matching this function name
+   */
+  public function upgrade_5_47_1($rev): void {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+  }
+
   /**
    * @param \CRM_Queue_TaskContext $ctx
    *
@@ -307,13 +317,6 @@ class CRM_Upgrade_Incremental_php_FiveFortySeven extends CRM_Upgrade_Incremental
             'domain_id' => 'current_domain',
           ],
         ],
-        'Navigation_Grants_Navigation_Grant_Reports' => [
-          'entity' => 'Navigation',
-          'values' => [
-            'name' => 'Grant Reports',
-            'domain_id' => 'current_domain',
-          ],
-        ],
       ];
       // Create an entry in civicrm_managed for each existing record that will be managed by the extension
       foreach ($managedItems as $name => $item) {

CRM/Upgrade/Incremental/sql/5.47.1.mysql.tpl

+{* file to handle db changes in 5.47.1 during upgrade *}
+
+-- Remove entry for Grant Reports since grant is not a component anymore so this url just shows an empty list
+DELETE FROM civicrm_navigation WHERE url='civicrm/report/list?compid=5&reset=1';

ext/afform/admin/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.23</ver>

ext/afform/core/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.23</ver>

ext/afform/html/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.23</ver>

ext/afform/mock/info.xml

@@ -12,7 +12,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

ext/authx/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-02-11</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.0</ver>

ext/civigrant/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-11-11</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.47</ver>

ext/civigrant/managed/Navigation_Grants.mgd.php

@@ -151,25 +151,4 @@ return [
       ],
     ],
   ],
-  [
-    'name' => 'Navigation_Grants_Navigation_Grant_Reports',
-    'entity' => 'Navigation',
-    'cleanup' => 'unused',
-    'update' => 'unmodified',
-    'params' => [
-      'version' => 4,
-      'values' => [
-        'label' => 'Grant Reports',
-        'name' => 'Grant Reports',
-        'url' => 'civicrm/report/list?compid=5&reset=1',
-        'icon' => NULL,
-        'permission' => 'access CiviGrant',
-        'permission_operator' => '',
-        'parent_id.name' => 'Grants',
-        'is_active' => TRUE,
-        'has_separator' => NULL,
-        'domain_id' => 'current_domain',
-      ],
-    ],
-  ],
 ];

ext/ckeditor4/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-05-23</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.39</ver>

ext/contributioncancelactions/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-12</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.32</ver>

ext/eventcart/info.xml

@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-03</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

ext/ewaysingle/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-07</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

ext/financialacls/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-27</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.30</ver>

ext/flexmailer/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-05</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>stable</develStage>
   <comments>
     FlexMailer is an email delivery engine which replaces the internal guts

ext/greenwich/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-07-21</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

ext/legacycustomsearches/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-07-25</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>stable</develStage>
   <tags>
     <tag>mgmt:hidden</tag>

ext/message_admin/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-06-12</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

ext/oauth-client/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-23</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.38</ver>

ext/payflowpro/info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-04-13</releaseDate>
-  <version>5.47.0</version>
+  <version>5.47.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.0</ver>