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

dev/core#1651 and dev/core#1637 - Inline editing not working on admin screens and other js packages issues #16780

Closed
wants to merge 1 commit into from
Closed

dev/core#1651 and dev/core#1637 - Inline editing not working on admin screens and other js packages issues #16780

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
3 changes: 2 additions & 1 deletion templates/CRM/common/l10n.js.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
// Config settings
CRM.config.userFramework = {$config->userFramework|@json_encode};
CRM.config.resourceBase = {$config->userFrameworkResourceURL|@json_encode};
CRM.config.packagesBase = {capture assign=packagesBase}{crmResURL expr='[civicrm.packages]/.'}{/capture}{$packagesBase|@json_encode};
CRM.config.packagesBase = {capture assign=packagesBase}{crmResURL expr='[civicrm.packages]'}{/capture}{$packagesBase|@json_encode};
CRM.config.packagesBase = CRM.config.packagesBase.replace(/\/+$/, '') + '/';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stylistically, I like this patch better than #16779, but yeah - as you found, the [civicrm.packages] doesn't evaluate as expected.

Since the output before was expected to end in a trailing slash, I can't help thinking that this might have been a one-character patch - just changing /. to /.

Copy link
Contributor Author

@demeritcowboy demeritcowboy Mar 16, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it's unfortunate I had some local issue/operator error that made it seem like it worked at first. I think for the regression though at this point it was more about not making everyone test/review things again on all cms's.

CRM.config.lcMessages = {$config->lcMessages|@json_encode};
CRM.config.locale = {$locale|@json_encode};
CRM.config.cid = {$cid|@json_encode};
Expand Down