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

Update api3 explorer url path for consistency #15597

Merged
merged 1 commit into from
Oct 24, 2019
Merged

Update api3 explorer url path for consistency #15597

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: 6 additions & 0 deletions CRM/Core/xml/Menu/Misc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@
</item>
<item>
<path>civicrm/api</path>
<page_callback>CRM_Core_Page_Redirect</page_callback>
<page_arguments>url=civicrm/api3</page_arguments>
<access_arguments>access CiviCRM</access_arguments>
Copy link
Member Author

Choose a reason for hiding this comment

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

@MikeyMJCO this adds the redirect.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks :-D missed that!

Copy link
Contributor

Choose a reason for hiding this comment

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

I'll do an r-run on this shortly.

Copy link
Contributor

Choose a reason for hiding this comment

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

This runs fine locally - both URLs work.

</item>
<item>
<path>civicrm/api3</path>
<page_callback>CRM_Admin_Page_APIExplorer</page_callback>
<access_arguments>access CiviCRM</access_arguments>
<title>CiviCRM API v3</title>
Expand Down
2 changes: 2 additions & 0 deletions CRM/Upgrade/Incremental/sql/5.20.alpha1.mysql.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{* file to handle db changes in 5.20.alpha1 during upgrade *}

UPDATE civicrm_navigation SET url = "civicrm/api3" WHERE url = "civicrm/api" AND domain_id = {$domainID};
4 changes: 2 additions & 2 deletions sql/civicrm_generated.mysql
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion xml/templates/civicrm_navigation.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ SET @devellastID:=LAST_INSERT_ID();
INSERT INTO civicrm_navigation
( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
VALUES
( @domainID, 'civicrm/api', '{ts escape="sql" skip="true"}Api Explorer v3{/ts}', 'API Explorer', 'administer CiviCRM', '', @devellastID, '1', NULL, 1 ),
( @domainID, 'civicrm/api3', '{ts escape="sql" skip="true"}Api Explorer v3{/ts}', 'API Explorer', 'administer CiviCRM', '', @devellastID, '1', NULL, 1 ),
( @domainID, 'civicrm/api4#/explorer', '{ts escape="sql" skip="true"}Api Explorer v4{/ts}', 'Api Explorer v4', 'administer CiviCRM', '', @devellastID, '1', NULL, 2 ),
( @domainID, 'https://civicrm.org/developer-documentation?src=iam', '{ts escape="sql" skip="true"}Developer Docs{/ts}', 'Developer Docs', 'administer CiviCRM', '', @devellastID, '1', NULL, 3 );

Expand Down