summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Neves2012-01-26 16:43:30 +0100
committerMichael Neves2012-01-26 16:43:30 +0100
commit08d88f61bc64b9a2a6a9980cde4df6a02d5078a1 (patch)
tree224b73e88cb75c619150219f56374799449be8d6
parentBootiso and Preboot Controller fix (diff)
downloadpbs2-08d88f61bc64b9a2a6a9980cde4df6a02d5078a1.tar.gz
pbs2-08d88f61bc64b9a2a6a9980cde4df6a02d5078a1.tar.xz
pbs2-08d88f61bc64b9a2a6a9980cde4df6a02d5078a1.zip
Bootiso and Preboot Model fix
-rw-r--r--application/models/BootIso.php4
-rw-r--r--application/models/BootIsoMapper.php8
-rw-r--r--application/models/PreBoot.php4
-rw-r--r--application/models/PreBootMapper.php8
4 files changed, 12 insertions, 12 deletions
diff --git a/application/models/BootIso.php b/application/models/BootIso.php
index 967a612..cd5ce64 100644
--- a/application/models/BootIso.php
+++ b/application/models/BootIso.php
@@ -88,10 +88,10 @@ class Application_Model_BootIso {
return $this;
}
- public function getPreBootTypeID() {
+ public function getPreboottypeID() {
return $this->_preboottypeID;
}
- public function setPreBootTypeID($_preboottypeID) {
+ public function setPreboottypeID($_preboottypeID) {
$this->_preboottypeID = $_preboottypeID;
return $this;
}
diff --git a/application/models/BootIsoMapper.php b/application/models/BootIsoMapper.php
index b6572c6..8a2509d 100644
--- a/application/models/BootIsoMapper.php
+++ b/application/models/BootIsoMapper.php
@@ -77,7 +77,7 @@ class Application_Model_BootIsoMapper {
public function save(Application_Model_BootIso $botiso) {
- $data = array('bootisoID' => $botiso->getID() , 'membershipID' => $botiso->getMembershipID() , 'title' => $botiso->getTitle() , 'groupID' => $botiso->getGroupID() , 'preboottypeID' => $botiso->getPreBootTypeID(), 'serialnumber' => $botiso->getSerialnumber() , 'created' => $botiso->getCreated() , 'expires' => $botiso->getExpires() , 'public' => $botiso->getPublic(), 'description' => $botiso->getDescription() );
+ $data = array('bootisoID' => $botiso->getID() , 'membershipID' => $botiso->getMembershipID() , 'title' => $botiso->getTitle() , 'groupID' => $botiso->getGroupID() , 'preboottypeID' => $botiso->getPreboottypeID(), 'serialnumber' => $botiso->getSerialnumber() , 'created' => $botiso->getCreated() , 'expires' => $botiso->getExpires() , 'public' => $botiso->getPublic(), 'description' => $botiso->getDescription() );
if (null === ($id = $botiso->getID()) ) {
unset($data['bootisoID']);
@@ -105,10 +105,10 @@ class Application_Model_BootIsoMapper {
if($botiso == null) {
$botiso = new Application_Model_BootIso();
- $botiso->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreBootTypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public)->setDescription($row->description);
+ $botiso->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreboottypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public)->setDescription($row->description);
return $botiso;
} else {
- $botiso->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreBootTypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public)->setDescription($row->description);
+ $botiso->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreboottypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public)->setDescription($row->description);
}
}
@@ -118,7 +118,7 @@ class Application_Model_BootIsoMapper {
foreach ($resultSet as $row) {
$entry = new Application_Model_BootIso();
- $entry->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreBootTypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public)->setDescription($row->description);
+ $entry->setID($row->bootisoID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreboottypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setCreated($row->created)->setExpires($row->expires)->setPublic($row->public)->setDescription($row->description);
$entries[] = $entry;
}
diff --git a/application/models/PreBoot.php b/application/models/PreBoot.php
index 5d6987f..4d898e3 100644
--- a/application/models/PreBoot.php
+++ b/application/models/PreBoot.php
@@ -81,11 +81,11 @@ class Application_Model_PreBoot {
$this->_groupID = $_groupID;
return $this;
}
- public function getPreBootTypeID() {
+ public function getPreboottypeID() {
return $this->_preboottypeID;
}
- public function setPreBootTypeID($_preboottypeID) {
+ public function setPreboottypeID($_preboottypeID) {
$this->_preboottypeID = $_preboottypeID;
return $this;
}
diff --git a/application/models/PreBootMapper.php b/application/models/PreBootMapper.php
index ac86d3c..fd070cd 100644
--- a/application/models/PreBootMapper.php
+++ b/application/models/PreBootMapper.php
@@ -81,7 +81,7 @@ class Application_Model_PreBootMapper {
public function save(Application_Model_PreBoot $preboot) {
- $data = array('prebootID' => $preboot->getID() , 'membershipID' => $preboot->getMembershipID() , 'title' => $preboot->getTitle() , 'groupID' => $preboot->getGroupID(), 'preboottypeID' => $preboot->getPreBootTypeID(), 'serialnumber' => $preboot->getSerialnumber(), 'created' => $preboot->getCreated(), 'source' => $preboot->getSource(), 'description' => $preboot->getDescription());
+ $data = array('prebootID' => $preboot->getID() , 'membershipID' => $preboot->getMembershipID() , 'title' => $preboot->getTitle() , 'groupID' => $preboot->getGroupID(), 'preboottypeID' => $preboot->getPreboottypeID(), 'serialnumber' => $preboot->getSerialnumber(), 'created' => $preboot->getCreated(), 'source' => $preboot->getSource(), 'description' => $preboot->getDescription());
if (null === ($id = $preboot->getID()) ) {
unset($data['prebootID']);
@@ -110,10 +110,10 @@ class Application_Model_PreBootMapper {
if($preboot == null) {
$preboot = new Application_Model_PreBoot();
- $preboot->setID($row->prebootID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreBootTypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setSource($row->source)->setCreated($row->created)->setDescription($row->description);
+ $preboot->setID($row->prebootID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreboottypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setSource($row->source)->setCreated($row->created)->setDescription($row->description);
return $preboot;
} else {
- $preboot->setID($row->prebootID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreBootTypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setSource($row->source)->setCreated($row->created)->setDescription($row->description);
+ $preboot->setID($row->prebootID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreboottypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setSource($row->source)->setCreated($row->created)->setDescription($row->description);
}
}
@@ -123,7 +123,7 @@ class Application_Model_PreBootMapper {
foreach ($resultSet as $row) {
$entry = new Application_Model_PreBoot();
- $entry->setID($row->prebootID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreBootTypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setSource($row->source)->setCreated($row->created)->setDescription($row->description);
+ $entry->setID($row->prebootID)->setMembershipID($row->membershipID)->setTitle($row->title)->setGroupID($row->groupID)->setPreboottypeID($row->preboottypeID)->setSerialnumber($row->serialnumber)->setSource($row->source)->setCreated($row->created)->setDescription($row->description);
$entries[] = $entry;
}