Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

COMCL-603: Correct visual bundle assets path #1020

Merged
merged 1 commit into from
Jul 18, 2024
Merged

COMCL-603: Correct visual bundle assets path #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ang/civicase-base.ang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
*/

use Civi\CCase\Utils as Utils;
use CRM_Civicase_Helper_OptionValues as OptionValuesHelper;
use CRM_Civicase_Helper_CaseUrl as CaseUrlHelper;
use CRM_Civicase_Helper_GlobRecursive as GlobRecursive;
use CRM_Civicase_Helper_NewCaseWebform as NewCaseWebform;
use CRM_Civicase_Helper_OptionValues as OptionValuesHelper;
use CRM_Civicase_Service_CaseCategoryCustomFieldsSetting as CaseCategoryCustomFieldsSetting;
use CRM_Civicase_Helper_CaseUrl as CaseUrlHelper;

[$caseCategoryId, $caseCategoryName] = CaseUrlHelper::getCategoryParamsFromUrl();

Expand Down Expand Up @@ -110,7 +110,7 @@ function expose_settings(array &$options, array $defaults) {
function get_base_js_files() {
return array_merge(
[
'assetBuilder://visual-bundle.js',
Civi::service('asset_builder')->getUrl('visual-bundle.js'),
'ang/civicase-base.js',
],
GlobRecursive::getRelativeToExtension(
Expand Down
10 changes: 5 additions & 5 deletions ang/civicase.ang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
* http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules.
*/

use CRM_Civicase_Helper_CaseCategory as CaseCategoryHelper;
use CRM_Civicase_Helper_CaseUrl as CaseUrlHelper;
use CRM_Civicase_Helper_GlobRecursive as GlobRecursive;
use CRM_Civicase_Service_CaseCategoryPermission as CaseCategoryPermission;
use CRM_Civicase_Helper_NewCaseWebform as NewCaseWebform;
use CRM_Civicase_Helper_CaseCategory as CaseCategoryHelper;
use CRM_Civicase_Hook_Permissions_ExportCasesAndReports as ExportCasesAndReports;
use CRM_Civicase_Helper_CaseUrl as CaseUrlHelper;
use CRM_Civicase_Service_CaseCategoryPermission as CaseCategoryPermission;

load_resources();
[$caseCategoryId, $caseCategoryName] = CaseUrlHelper::getCategoryParamsFromUrl();
Expand Down Expand Up @@ -96,7 +96,7 @@ function get_js_files() {
[
// At the moment, it's safe to include this multiple times.
// deduped by resource manager.
'assetBuilder://visual-bundle.js',
Civi::service('asset_builder')->getUrl('visual-bundle.js'),
'ang/civicase.js',
],
GlobRecursive::getRelativeToExtension(
Expand Down Expand Up @@ -255,7 +255,7 @@ function set_contact_tasks(&$options) {
'css' => [
// At the moment, it's safe to include this multiple times.
// deduped by resource manager.
'assetBuilder://visual-bundle.css',
Civi::service('asset_builder')->getUrl('visual-bundle.css'),
'css/*.css',
],
'partials' => [
Expand Down
Loading