diff --git a/core/lib/Thelia/Core/Security/User/UserInterface.php b/core/lib/Thelia/Core/Security/User/UserInterface.php index b747fdffa..b6642ba47 100755 --- a/core/lib/Thelia/Core/Security/User/UserInterface.php +++ b/core/lib/Thelia/Core/Security/User/UserInterface.php @@ -31,7 +31,7 @@ interface UserInterface { * * public function getRoles() * { - * return array('ROLE_USER'); + * return array('USER'); * } * * diff --git a/core/lib/Thelia/Model/Admin.php b/core/lib/Thelia/Model/Admin.php index 42d84ea93..34dc7fbfd 100755 --- a/core/lib/Thelia/Model/Admin.php +++ b/core/lib/Thelia/Model/Admin.php @@ -63,6 +63,6 @@ class Admin extends BaseAdmin implements UserInterface * {@inheritDoc} */ public function getRoles() { - return array(new Role('ROLE_ADMIN')); + return array(new Role('ADMIN')); } } diff --git a/core/lib/Thelia/Model/Customer.php b/core/lib/Thelia/Model/Customer.php index 2b58787e0..4d9a78ea0 100755 --- a/core/lib/Thelia/Model/Customer.php +++ b/core/lib/Thelia/Model/Customer.php @@ -164,6 +164,6 @@ class Customer extends BaseCustomer implements UserInterface * {@inheritDoc} */ public function getRoles() { - return array(new Role('ROLE_CUSTOMER')); + return array(new Role('CUSTOMER')); } } diff --git a/templates/admin/default/home.html b/templates/admin/default/home.html index ebd61a7d1..1f1e7b4e5 100755 --- a/templates/admin/default/home.html +++ b/templates/admin/default/home.html @@ -1,4 +1,4 @@ -{check_auth context="admin" roles="ROLE_ADMIN" login_tpl="/admin/login"} +{check_auth context="admin" roles="ADMIN" login_tpl="/admin/login"} {$page_title={intl l='Home'}} {include file='includes/header.inc.html'} diff --git a/templates/default/includes/header.html b/templates/default/includes/header.html index e18f75232..0b93b6a1c 100755 --- a/templates/default/includes/header.html +++ b/templates/default/includes/header.html @@ -10,11 +10,11 @@
-{loop type="auth" name="customer_info_block" roles="ROLE_CUSTOMER" context="front"} +{loop type="auth" name="customer_info_block" roles="CUSTOMER" context="front"}

Your are logged in ! Logout

{/loop} -{loop type="auth" name="admin_info_block" roles="ROLE_ADMIN" context="admin"} +{loop type="auth" name="admin_info_block" roles="ADMIN" context="admin"}

You are logged as administrator

{/loop} diff --git a/templates/default/index.html b/templates/default/index.html index 6ee109b9e..53834febf 100755 --- a/templates/default/index.html +++ b/templates/default/index.html @@ -1,7 +1,7 @@ {include file="includes/header.html"}
-{loop type="auth" name="auth_test" context="front" roles="ROLE_CUSTOMER"} +{loop type="auth" name="auth_test" context="front" roles="CUSTOMER"}

Customer is authentified :-)

{/loop} diff --git a/templates/default/myaccount.html b/templates/default/myaccount.html index 2b712f71d..01cefa850 100644 --- a/templates/default/myaccount.html +++ b/templates/default/myaccount.html @@ -1,4 +1,4 @@ -{check_auth context="front" roles="ROLE_CUSTOMER" login_tpl="login"} +{check_auth context="front" roles="CUSTOMER" login_tpl="login"} {$page_title="{intl l='My Account'}"}