dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix shop selection in BO

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8083 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-17 08:59:04 +00:00
parent 2b05b5308c
commit 751ae5d740
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/header.inc.php
+2 -2
View File
@@ -72,8 +72,8 @@ echo '
<a id="header_shopname" href="index.php"><span>'.Configuration::get('PS_SHOP_NAME').'</span></a><br /> <a id="header_shopname" href="index.php"><span>'.Configuration::get('PS_SHOP_NAME').'</span></a><br />
'.Tools::substr($employee->firstname, 0, 1).'.&nbsp;'.htmlentities($employee->lastname, ENT_COMPAT, 'UTF-8').' '.Tools::substr($employee->firstname, 0, 1).'.&nbsp;'.htmlentities($employee->lastname, ENT_COMPAT, 'UTF-8').'
[ <a href="index.php?logout" id="header_logout"><span>'.translate('logout').'</span></a> ]'; [ <a href="index.php?logout" id="header_logout"><span>'.translate('logout').'</span></a> ]';
if (Context::getContext()->shop->getBaseURI()) if (Context::getContext()->shop->getBaseURL())
echo '- <a href="'.Context::getContext()->shop->getBaseURI().'" id="header_foaccess" target="_blank" title="'.translate('View my shop').'"><span>'.translate('View my shop').'</span></a>'; echo '- <a href="'.Context::getContext()->shop->getBaseURL().'" id="header_foaccess" target="_blank" title="'.translate('View my shop').'"><span>'.translate('View my shop').'</span></a>';
echo ' - <a href="index.php?tab=AdminEmployees&id_employee='.(int)$cookie->id_employee.'&updateemployee&token='.Tools::getAdminTokenLite('AdminEmployees').'" style="font-size: 10px;"><img src="../img/admin/employee.gif" alt="" /> '.translate('My preferences').'</a> echo ' - <a href="index.php?tab=AdminEmployees&id_employee='.(int)$cookie->id_employee.'&updateemployee&token='.Tools::getAdminTokenLite('AdminEmployees').'" style="font-size: 10px;"><img src="../img/admin/employee.gif" alt="" /> '.translate('My preferences').'</a>
</span></div> </span></div>
<div id="header_search"> <div id="header_search">
classes/Shop.php
+12 -1
View File
@@ -258,7 +258,6 @@ class ShopCore extends ObjectModel
} }
/** /**
*
* Get shop URI * Get shop URI
* *
* @return string * @return string
@@ -272,6 +271,18 @@ class ShopCore extends ObjectModel
{ {
return $this->physical_uri; return $this->physical_uri;
} }
/**
* Get shop URL
*
* @return string
*/
public function getBaseURL()
{
if (!$this->domain)
return false;
return 'http://'.$this->domain.$this->physical_uri.$this->virtual_uri;
}
/** /**
* Get group of current shop * Get group of current shop