summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael pereira2011-03-29 12:10:44 +0200
committermichael pereira2011-03-29 12:10:44 +0200
commitd008a1c77392885c4ee57b8e95512c6dd0be0f73 (patch)
treeff2b5a5f602c9149ed511095eb21097a8bf7919d
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-d008a1c77392885c4ee57b8e95512c6dd0be0f73.tar.gz
pbs2-d008a1c77392885c4ee57b8e95512c6dd0be0f73.tar.xz
pbs2-d008a1c77392885c4ee57b8e95512c6dd0be0f73.zip
sql fixed
-rw-r--r--application/modules/user/controllers/PrebootController.php3
-rw-r--r--pbs.sql6
2 files changed, 4 insertions, 5 deletions
diff --git a/application/modules/user/controllers/PrebootController.php b/application/modules/user/controllers/PrebootController.php
index e1e67a5..1491ae9 100644
--- a/application/modules/user/controllers/PrebootController.php
+++ b/application/modules/user/controllers/PrebootController.php
@@ -12,8 +12,7 @@ class User_PrebootController extends Zend_Controller_Action
if (Zend_Auth::getInstance()->hasIdentity()) {
$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
if($userIDsNamespace['membershipID'] ==''){
- $pbsNotifier = new Pbs_Notifier();
- echo $pbsNotifier->notify('No membershipID set','forbidden');
+ $this->_redirect('/user/index');
}
$this->prebootMapper = new Application_Model_PreBootMapper();
diff --git a/pbs.sql b/pbs.sql
index 38fb8f6..faf5acc 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -147,7 +147,7 @@ CREATE TABLE IF NOT EXISTS `pbs_bootos` (
PRIMARY KEY (`bootosID`),
KEY `configID` (`configID`),
KEY `groupID` (`groupID`),
- KEY `membershipID` (`membershipID`),
+ KEY `membershipID` (`membershipID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
ALTER TABLE `pbs_bootos`
@@ -188,7 +188,7 @@ CREATE TABLE IF NOT EXISTS `pbs_bootmenuentries` (
ALTER TABLE `pbs_bootmenuentries`
ADD CONSTRAINT `pbs_bootmenuentries_ibfk_1` FOREIGN KEY (`bootmenuID`) REFERENCES `pbs_bootmenu` (`bootmenuID`) ON DELETE CASCADE,
ADD CONSTRAINT `pbs_bootmenuentries_ibfk_2` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE CASCADE,
- ADD CONSTRAINT `pbs_bootmenuentries_ibfk_3` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`) ON DELETE SET NULL,
+ ADD CONSTRAINT `pbs_bootmenuentries_ibfk_3` FOREIGN KEY (`configID`) REFERENCES `pbs_config` (`configID`) ON DELETE SET NULL;
CREATE TABLE IF NOT EXISTS `pbs_preboot` (
`prebootID` int(11) NOT NULL AUTO_INCREMENT,
@@ -359,7 +359,7 @@ INSERT INTO `pbs_rightcategory` (`rightcategoryID`, `title`) VALUES
(11, 'Filter');
-- Insert rights
-INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `title`, `description`) VALUES
+INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES
-- Person
-- Eigene Personendetails ändern
(NULL, '1', '', 'Edit own profiledetails', NULL),