From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 25 Nov 2020 19:07:24 +0000 (-0500)
Subject: Fix crmStatusPage file name to match module name per convention
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cd6afc752a330829a01a19cbb00b4985076a7d67;p=civicrm-core.git

Fix crmStatusPage file name to match module name per convention
---

diff --git a/Civi/Angular/Manager.php b/Civi/Angular/Manager.php
index d19c8c328e..72e3f4401a 100644
--- a/Civi/Angular/Manager.php
+++ b/Civi/Angular/Manager.php
@@ -118,7 +118,7 @@ class Manager {
       $angularModules['ui.bootstrap'] = include "$civicrm_root/ang/ui.bootstrap.ang.php";
       $angularModules['ui.sortable'] = include "$civicrm_root/ang/ui.sortable.ang.php";
       $angularModules['unsavedChanges'] = include "$civicrm_root/ang/unsavedChanges.ang.php";
-      $angularModules['statuspage'] = include "$civicrm_root/ang/crmStatusPage.ang.php";
+      $angularModules['crmStatusPage'] = include "$civicrm_root/ang/crmStatusPage.ang.php";
       $angularModules['exportui'] = include "$civicrm_root/ang/exportui.ang.php";
       $angularModules['api4Explorer'] = include "$civicrm_root/ang/api4Explorer.ang.php";
       $angularModules['api4'] = include "$civicrm_root/ang/api4.ang.php";
diff --git a/ang/crmStatusPage.ang.php b/ang/crmStatusPage.ang.php
index b6d7937440..e5c2d397e4 100644
--- a/ang/crmStatusPage.ang.php
+++ b/ang/crmStatusPage.ang.php
@@ -1,6 +1,5 @@
 <?php
 // This file declares an Angular module which can be autoloaded
-// ODDITY: Angular name 'statuspage' doesn't match the file name 'crmStatusPage'.
 
 return [
   'ext' => 'civicrm',
diff --git a/ang/crmStatusPage.js b/ang/crmStatusPage.js
index b0db81a350..9693485b66 100644
--- a/ang/crmStatusPage.js
+++ b/ang/crmStatusPage.js
@@ -1,11 +1,11 @@
 (function(angular, $, _) {
-  angular.module('statuspage', CRM.angRequires('statuspage'));
+  angular.module('crmStatusPage', CRM.angRequires('crmStatusPage'));
 
   // router
-  angular.module('statuspage').config( function($routeProvider) {
+  angular.module('crmStatusPage').config( function($routeProvider) {
     $routeProvider.when('/status', {
-      controller: 'statuspageStatusPage',
-      templateUrl: '~/statuspage/StatusPage.html',
+      controller: 'crmStatusPageCtrl',
+      templateUrl: '~/crmStatusPage/StatusPage.html',
 
       resolve: {
         statusData: function(crmApi) {
diff --git a/ang/crmStatusPage/StatusPageCtrl.js b/ang/crmStatusPage/StatusPageCtrl.js
index 4abca2ab81..530d7ffdbe 100644
--- a/ang/crmStatusPage/StatusPageCtrl.js
+++ b/ang/crmStatusPage/StatusPageCtrl.js
@@ -1,6 +1,6 @@
 (function(angular, $, _) {
 
-  angular.module('statuspage').controller('statuspageStatusPage',
+  angular.module('crmStatusPage').controller('crmStatusPageCtrl',
     function($scope, crmApi, crmStatus, statusData) {
       $scope.ts = CRM.ts();
       $scope.help = CRM.help;
@@ -40,7 +40,7 @@
           }]
         ], 'Set preference');
       };
-      
+
       $scope.countVisible = function(visibility) {
         return _.filter($scope.statuses, function(s) {
           return s.is_visible == visibility && s.severity_id >= 2;
diff --git a/ang/crmStatusPage/StatusPageServices.js b/ang/crmStatusPage/StatusPageServices.js
index a37ceafb9a..e895d8979c 100644
--- a/ang/crmStatusPage/StatusPageServices.js
+++ b/ang/crmStatusPage/StatusPageServices.js
@@ -1,12 +1,12 @@
 (function(angular, $, _) {
 
-  angular.module('statuspage')
+  angular.module('crmStatusPage')
     .filter('trusted', function($sce){ return $sce.trustAsHtml; })
 
     // Todo: abstract this into a generic crmUi directive?
     .directive('statuspagePopupMenu', function($timeout) {
       return {
-        templateUrl: '~/statuspage/SnoozeOptions.html',
+        templateUrl: '~/crmStatusPage/SnoozeOptions.html',
         transclude: true,
 
         link: function(scope, element, attr) {