summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/configs/application.ini.dist2
-rw-r--r--application/models/Membership.php10
-rw-r--r--application/models/MembershipMapper.php6
3 files changed, 15 insertions, 3 deletions
diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist
index 4ef9da7..041f0f8 100644
--- a/application/configs/application.ini.dist
+++ b/application/configs/application.ini.dist
@@ -17,6 +17,7 @@ resources.view[] = ""
resources.modules = ""
pbs2.host =
pbs2.login = /resource/login/
+pbs2.checkright = /resource/checkright/apikey
pbs2.getbootoss = /resource/getbootos/apikey/
pbs2.getpools = /resource/getpool/apikey/
pbs2.addbootmenu = /resource/addbootmenu/apikey/
@@ -24,6 +25,7 @@ pbs2.deletebootmenu = /resource/deletebootmenu/apikey/
pbs2.addfilter = /resource/addfilter/apikey/
pbs2.deletefilter = /resource/deletefilter/apikey/
pbs2.getperson = /resource/getperson/apikey/
+pbs2.getmembership = /resource/getmembership/apikey/
pbs2.getgroup = /resource/getgroup/apikey/
resources.layout.layout = "default"
diff --git a/application/models/Membership.php b/application/models/Membership.php
index 7f8e9e7..a455848 100644
--- a/application/models/Membership.php
+++ b/application/models/Membership.php
@@ -14,6 +14,7 @@ class Application_Model_Membership
{
protected $_membershipID;
protected $_groupID;
+ protected $_roleID;
protected $_personID;
protected $_suspend;
protected $_apikey;
@@ -74,6 +75,15 @@ class Application_Model_Membership
$this->_groupID = $_groupID;
return $this;
}
+ public function getRoleID()
+ {
+ return $this->_roleID;
+ }
+ public function setRoleID($_roleID)
+ {
+ $this->_roleID = $_roleID;
+ return $this;
+ }
public function getPersonID()
{
return $this->_personID;
diff --git a/application/models/MembershipMapper.php b/application/models/MembershipMapper.php
index 1d84da5..6786c92 100644
--- a/application/models/MembershipMapper.php
+++ b/application/models/MembershipMapper.php
@@ -84,7 +84,7 @@ class Application_Model_MembershipMapper
public function save(Application_Model_Membership $membership)
{
- $data = array('membershipID'=> $membership->getID() ,'groupID'=> $membership->getGroupID() ,'personID'=> $membership->getPersonID() ,'suspend'=> $membership->getSuspend(), 'apikey'=> $membership->getApikey() );
+ $data = array('membershipID'=> $membership->getID() ,'groupID'=> $membership->getGroupID() ,'roleID'=> $membership->getRoleID() ,'personID'=> $membership->getPersonID() ,'suspend'=> $membership->getSuspend(), 'apikey'=> $membership->getApikey() );
if (null === ($id = $membership->getID()) ) {
unset($data['membershipID']);
@@ -119,7 +119,7 @@ class Application_Model_MembershipMapper
$row = $result->current();
- $membership->setID($row->membershipID)->setGroupID($row->groupID)->setPersonID($row->personID)->setSuspend($row->suspend)->setApikey($row->apikey);
+ $membership->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID)->setSuspend($row->suspend)->setApikey($row->apikey);
if($return){
return $membership;
}
@@ -132,7 +132,7 @@ class Application_Model_MembershipMapper
foreach ($resultSet as $row) {
$entry = new Application_Model_Membership();
- $entry->setID($row->membershipID)->setGroupID($row->groupID)->setPersonID($row->personID)->setSuspend($row->suspend)->setApikey($row->apikey);
+ $entry->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID)->setSuspend($row->suspend)->setApikey($row->apikey);
$entries[] = $entry;
}