espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

isAdmin fixes

Browse Source
This commit is contained in:
Taras Machyshyn
2013-11-25 13:45:16 +02:00
parent 8d678fc39e
commit 96f419a39a
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Controllers/Settings.php
+3 -20
View File
@@ -9,32 +9,15 @@ class Settings extends \Espo\Core\Controllers\Base
public function actionRead($params, $data)
{
$admin = false;
if ($this->getUser() instanceof \Espo\Entities\User) {
$admin = $this->getUser()->isAdmin();
}
return $this->getConfig()->getJsonData($admin);
//return $this->getConfig()->getJsonData($this->getUser()->isAdmin());
return $this->getConfig()->getJsonData($this->getUser()->isAdmin());
}
public function actionPatch($params, $data)
{
$admin = false;
if ($this->getUser() instanceof \Espo\Entities\User) {
$admin = $this->getUser()->isAdmin();
}
$result = $this->getConfig()->setJsonData($data, $admin);
$result = $this->getConfig()->setJsonData($data, $this->getUser()->isAdmin());
if ($result === false) {
throw new Error('Cannot save settings');
}
return $this->getConfig()->getJsonData($admin);
/*$result = $this->getConfig()->setJsonData($data, $this->getUser()->isAdmin());
if ($result === false) {
throw new Error('Cannot save settings');
}
return $this->getConfig()->getJsonData($this->getUser()->isAdmin());*/
return $this->getConfig()->getJsonData($this->getUser()->isAdmin());
}
}
application/Espo/Core/Utils/Api/Auth.php
+1
View File
@@ -32,6 +32,7 @@ class Auth extends \Slim\Middleware
if (!empty($routes[0])) {
$routeConditions = $routes[0]->getConditions();
if (isset($routeConditions['auth']) && $routeConditions['auth'] === false) {
$this->container->setUser(new \Espo\Entities\User());
$this->next->call();
return;
}