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

Merge branch 'master' into actions

Browse Source 
Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php
This commit is contained in:
Manuel Raynaud
2013-08-09 16:46:56 +02:00
parent 31743fd987 d365146231
commit d213278fe3
25 changed files with 7899 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Core/Security/SecurityContext.php
View File

@@ -133,7 +133,7 @@ class SecurityContext {
}
// Get permissions from profile
// $userPermissions = $user->getPermissions();
// $userPermissions = $user->getPermissions(); FIXME
// TODO: Finalize permissions system !;

10
core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
View File

@@ -49,7 +49,13 @@ class UrlGenerator extends AbstractSmartyPlugin
// the path to process
$path = $this->getParam($params, 'path');
return URL::absoluteUrl($path, $this->getArgsFromParam($params, array('path')));
$target = $this->getParam($params, 'target', null);
$url = URL::absoluteUrl($path, $this->getArgsFromParam($params, array('path', 'target')));
if ($target != null) $url .= '#'.$target;
return $url;
}
/**
@@ -84,7 +90,7 @@ class UrlGenerator extends AbstractSmartyPlugin
// the related action (optionale)
$action = $this->getParam($params, 'action');
$args = $this->getArgsFromParam($params, array('view', 'action'));
$args = $this->getArgsFromParam($params, array('view', 'action', 'target'));
if (! empty($action)) $args['action'] = $action;