Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

1 files changed, 9 insertions, 5 deletions

diff --git a/application/models/BootOs.php b/application/models/BootOs.php
index 57d1423..a2eea2f 100644
--- a/application/models/BootOs.php
+++ b/application/models/BootOs.php
@@ -2,11 +2,15 @@
 
 class Application_Model_BootOs
 {
-	protected $_bootisoID;
-	protected $_membershipID;
+	protected $_bootosID;
+	protected $_configID;
 	protected $_groupID;
-	protected $_serialnumber;
+	protected $_title;
+	protected $_path_init;
+	protected $_path_kernel;
+	protected $_defaultkcl;
 	protected $_created;
+	protected $_description;
 	protected $_expires;
 	protected $_public;
 
@@ -48,11 +52,11 @@ class Application_Model_BootOs
 	}
 
 
-	public function getBootosID()
+	public function getID()
 	{
 		return $this->_bootosID;
 	}
-	public function setBootosID($_bootosID)
+	public function setID($_bootosID)
 	{
 		$this->_bootosID = $_bootosID;
 		return $this;