summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-06-29 17:46:46 +0200
committerBjörn Geiger2011-06-29 17:46:46 +0200
commit5f2f6d70699c0d42bb3db34a2b38a1d178899c86 (patch)
tree058a4934f25506fccc8c0b750e3110a21068e6f1
parentEventcategory nun in eigener Tabelle (diff)
downloadpoolctrl-5f2f6d70699c0d42bb3db34a2b38a1d178899c86.tar.gz
poolctrl-5f2f6d70699c0d42bb3db34a2b38a1d178899c86.tar.xz
poolctrl-5f2f6d70699c0d42bb3db34a2b38a1d178899c86.zip
Fehler in eventcategory korrigiert
-rw-r--r--application/models/Eventcategory.php2
-rw-r--r--setup/poolctrl_data.sql6
2 files changed, 4 insertions, 4 deletions
diff --git a/application/models/Eventcategory.php b/application/models/Eventcategory.php
index cbb5916..0e659fa 100644
--- a/application/models/Eventcategory.php
+++ b/application/models/Eventcategory.php
@@ -12,7 +12,7 @@
class Application_Model_Eventcategory
{
- protected $_eventcategory;
+ protected $_eventcategoryID;
protected $_title;
public function __construct(array $options = null)
diff --git a/setup/poolctrl_data.sql b/setup/poolctrl_data.sql
index dd08c97..a4339eb 100644
--- a/setup/poolctrl_data.sql
+++ b/setup/poolctrl_data.sql
@@ -102,9 +102,9 @@ INSERT INTO `pbs_poolentries` (`poolentriesID`, `poolID`, `clientID`) VALUES
-- Adding eventcategories
INSERT INTO `poolctrl_eventcategory` (`eventcategoryID`, `title`) VALUES
(1, 'Lecture'),
-(2, 'Private'),
-(3, 'Public'),
-(4, 'Maintenance');
+(2, 'Maintenance'),
+(3, 'Private'),
+(4, 'Public');
-- Adding events
INSERT INTO `poolctrl_event` (`eventID`, `title`, `start`, `end`, `category`, `pbs_poolID`, `pbs_membershipID`, `pbs_bootosID`, `note`) VALUES