Added support for permissions. Next is to implement some.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@798 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -9,6 +9,8 @@ class Option extends AppModel {
|
||||
array('User', 'Site', 'Group');
|
||||
|
||||
|
||||
static $option_set = array();
|
||||
|
||||
function getAll($name) {
|
||||
$this->prClassLevel(30);
|
||||
/* //$this->OptionValue->prClassLevel(30); */
|
||||
@@ -19,6 +21,11 @@ class Option extends AppModel {
|
||||
/* $this->OptionValue->DefaultOption->prClassLevel(30); */
|
||||
$this->prEnter(compact('name'));
|
||||
|
||||
if (!empty(self::$option_set[$name]) && !$force)
|
||||
return $this->prReturn(self::$option_set[$name]);
|
||||
|
||||
self::$option_set[$name] = array();
|
||||
|
||||
$site_id = $this->Site->currentSiteId();
|
||||
$user_id = $this->User->currentUserId();
|
||||
$group_ids = $this->Group->currentGroupIds();
|
||||
@@ -27,28 +34,26 @@ class Option extends AppModel {
|
||||
/* $user_id = 4; */
|
||||
/* $group_ids = $this->Group->groupIds($user_id, $site_id); */
|
||||
|
||||
$values = array();
|
||||
|
||||
if (!empty($site_id))
|
||||
$values =
|
||||
array_merge($values,
|
||||
self::$option_set[$name] =
|
||||
array_merge(self::$option_set[$name],
|
||||
$this->OptionValue->SiteOption->values($site_id, $name));
|
||||
|
||||
if (!empty($user_id))
|
||||
$values =
|
||||
array_merge($values,
|
||||
self::$option_set[$name] =
|
||||
array_merge(self::$option_set[$name],
|
||||
$this->OptionValue->UserOption->values($user_id, $name));
|
||||
|
||||
if (!empty($group_ids))
|
||||
$values =
|
||||
array_merge($values,
|
||||
self::$option_set[$name] =
|
||||
array_merge(self::$option_set[$name],
|
||||
$this->OptionValue->GroupOption->values($group_ids, $name));
|
||||
|
||||
$values =
|
||||
array_merge($values,
|
||||
self::$option_set[$name] =
|
||||
array_merge(self::$option_set[$name],
|
||||
$this->OptionValue->DefaultOption->values($name));
|
||||
|
||||
return $this->prReturn($values);
|
||||
return $this->prReturn(self::$option_set[$name]);
|
||||
}
|
||||
|
||||
function get($name) {
|
||||
|
||||
Reference in New Issue
Block a user