summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSimon2011-03-25 17:39:36 +0100
committerSimon2011-03-25 17:39:36 +0100
commitaba09f3d48c3d700135be795a330d9dc41298266 (patch)
treea7b9585a10717538e6d9917f3968bf5fa6c17208 /application
parentNicht benötigte Tabellen entfernt, Diagramm wird automatisch generiert, Stat... (diff)
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-aba09f3d48c3d700135be795a330d9dc41298266.tar.gz
pbs2-aba09f3d48c3d700135be795a330d9dc41298266.tar.xz
pbs2-aba09f3d48c3d700135be795a330d9dc41298266.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application')
-rw-r--r--application/modules/dev/controllers/BootosController.php1
-rw-r--r--application/modules/dev/controllers/ResourceController.php3
-rw-r--r--application/modules/fbgui/controllers/IndexController.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/application/modules/dev/controllers/BootosController.php b/application/modules/dev/controllers/BootosController.php
index 1f31a69..5999624 100644
--- a/application/modules/dev/controllers/BootosController.php
+++ b/application/modules/dev/controllers/BootosController.php
@@ -51,6 +51,7 @@ class dev_BootosController extends Zend_Controller_Action
if ($createbootosForm->isValid($_POST)) {
$bootos = new Application_Model_BootOs($_POST);
+
$bootos->setMembershipID('1');
if($bootos->getConfigID() == '')
$bootos->setConfigID(NULL);
diff --git a/application/modules/dev/controllers/ResourceController.php b/application/modules/dev/controllers/ResourceController.php
index 03807c7..4e92ce3 100644
--- a/application/modules/dev/controllers/ResourceController.php
+++ b/application/modules/dev/controllers/ResourceController.php
@@ -111,8 +111,7 @@ class dev_ResourceController extends Zend_Controller_Action
$result = $bme->getKcl() . " " . $bme->getKclappend();
else
$result = $bme->getKclappend();
-
- $result .= " session=".$_SESSION['alphasessionID'];
+
echo $result;
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 0719b89..91d045d 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -28,7 +28,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
$groupID = $bootiso->getGroupID();
}
elseif(isset($_POST['serialnumber'])){
- $result = array();
+
$results = $bootisomapper->findBy('serialnumber',$_POST['serialnumber']);
print_a($results);
$bootiso->setOptions($results[0]);