Skip to content

[4.2] Add namespace support for templates #30816

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

Closed
wants to merge 13 commits into from
Closed

[4.2] Add namespace support for templates #30816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b1612b4
Add namespace support for templates
thednp Sep 30, 2020
38bbb4e
Update namespacemap.php
thednp Oct 1, 2020
6241ce1
Update libraries/namespacemap.php
thednp Oct 5, 2020
3e6c451
Update HtmlView.php
thednp Feb 10, 2021
b063c88
Update HtmlView.php
thednp Feb 10, 2021
d62ff86
Merge branch '4.0-dev' into patch-2
richard67 Feb 10, 2021
1d0f918
Update HtmlView.php
thednp Feb 10, 2021
38850dd
Update administrator/components/com_templates/src/View/Template/HtmlV…
thednp Feb 13, 2021
7069e3f
Update HtmlView.php
thednp Feb 13, 2021
d65b415
Update administrator/components/com_templates/src/View/Template/HtmlV…
thednp Feb 13, 2021
e32e22d
Update HtmlView.php
thednp Feb 13, 2021
204eb0f
Update HtmlView.php
thednp Feb 13, 2021
1d98ab1
Update administrator/components/com_templates/src/View/Template/HtmlV…
thednp Feb 13, 2021
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
7 changes: 6 additions & 1 deletion administrator/components/com_templates/src/View/Template/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,12 @@ protected function addToolbar()
// Add a copy template button
elseif ($this->type === 'home')
{
ToolbarHelper::modal('copyModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
$templatesPath = ((int) $this->template->client_id === 1 ? JPATH_ADMINISTRATOR : JPATH_SITE) . '/templates/';
$templateDetails = $templatesPath . $this->template->name . '/templateDetails.xml';
$templateXML = simplexml_load_file($templateDetails);
if ((string) $templateXML->namespace === '' || $templateXML->namespace === null) {
ToolbarHelper::modal('copyModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
}
}
}

Expand Down
8 changes: 7 additions & 1 deletion libraries/namespacemap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public function create()
$extensions = array_merge(
$this->getNamespaces('component'),
$this->getNamespaces('module'),
$this->getNamespaces('template'),
$this->getNamespaces('plugin'),
$this->getNamespaces('library')
);
Expand Down Expand Up @@ -139,7 +140,7 @@ protected function writeNamespaceFile($elements)
*/
private function getNamespaces(string $type): array
{
if (!in_array($type, ['component', 'module', 'plugin', 'library'], true))
if (!in_array($type, ['component', 'module', 'plugin', 'template', 'library'], true))
{
return [];
}
Expand All @@ -153,6 +154,10 @@ private function getNamespaces(string $type): array
{
$directories = [JPATH_SITE . '/modules', JPATH_ADMINISTRATOR . '/modules'];
}
elseif ($type === 'template')
{
$directories = [JPATH_SITE . '/templates', JPATH_ADMINISTRATOR . '/templates'];
}
elseif ($type === 'plugin')
{
$directories = Folder::folders(JPATH_PLUGINS, '.', false, true);
Expand All @@ -173,6 +178,7 @@ private function getNamespaces(string $type): array

// Strip the com_ from the extension name for components
$name = str_replace('com_', '', $extension, $count);
$name = $type === 'template' ? 'templateDetails' : $name;
$file = $extensionPath . $name . '.xml';

// If there is no manifest file, ignore. If it was a component check if the xml was named with the com_ prefix.
Expand Down