TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some tweaks added. We can now override module assets by redefining them in the template.

Browse Source 
if they are not in the template, it takes them from the module.

if an asset does not exist, exception is catched and it no longer breaks the response.
This commit is contained in:
Julien Chanséaume
2014-05-06 09:23:38 +02:00
parent 4985834cb9
commit bb43a12fba
1 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
View File

@@ -12,6 +12,7 @@
namespace Thelia\Core\Template\Smarty\Assets;
use Thelia\Log\Tlog;
use Thelia\Tools\URL;
use Thelia\Core\Template\Assets\AssetManagerInterface;
@@ -108,6 +109,27 @@ class SmartyAssetsManager
$templateDirectories = $smartyParser->getTemplateDirectories($templateDefinition->getType());
// if it's not a custom template and looking for a different origin (e.g. module)
// we first check if the asset is present in the default "source" (template)
// if not we take the default asset from the assetOrigin (module)
if (! $webAssetTemplate && $assetOrigin !== "0") {
if (isset($templateDirectories[$templateDefinition->getName()]["0"])) {
if (file_exists($templateDirectories[$templateDefinition->getName()]["0"] . DS . $file)) {
// the file exists, we take the default origin
$assetOrigin = "0";
}
}
}
if (! isset($templateDirectories[$templateDefinition->getName()][$assetOrigin])) {
// we try with the default origin
if (! $webAssetTemplate && $assetOrigin !== "0") {
$assetOrigin = "0";
} else {
throw new \Exception("Failed to get real path of '/".dirname($file)."'");
}
}
if (! isset($templateDirectories[$templateDefinition->getName()][$assetOrigin])) {
throw new \Exception("Failed to get real path of '/".dirname($file)."'");
}
@@ -119,17 +141,21 @@ class SmartyAssetsManager
$file = str_replace('/', DS, $file);
}
$url = $this->assetsManager->processAsset(
$assetSource . DS . $file,
$assetSource . DS . self::$assetsDirectory,
$this->web_root . $this->path_relative_to_web_root,
$templateDefinition->getPath(),
$assetOrigin,
URL::getInstance()->absoluteUrl($this->path_relative_to_web_root, null, URL::PATH_TO_FILE /* path only */),
$assetType,
$filters,
$debug
);
$url = "";
// test if file exists before running the process
if (file_exists($assetSource . DS . $file)) {
$url = $this->assetsManager->processAsset(
$assetSource . DS . $file,
$assetSource . DS . self::$assetsDirectory,
$this->web_root . $this->path_relative_to_web_root,
$templateDefinition->getPath(),
$assetOrigin,
URL::getInstance()->absoluteUrl($this->path_relative_to_web_root, null, URL::PATH_TO_FILE /* path only */),
$assetType,
$filters,
$debug
);
}
return $url;
}
@@ -138,10 +164,13 @@ class SmartyAssetsManager
{
// Opening tag (first call only)
if ($repeat) {
$url = $this->computeAssetUrl($assetType, $params, $template);
$url = "";
try {
$url = $this->computeAssetUrl($assetType, $params, $template);
} catch (\Exception $ex) {
Tlog::getInstance()->addWarning("Failed to get real path of " . $params['file']);
}
$template->assign('asset_url', $url);
} elseif (isset($content)) {
return $content;
}