summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/fbgui/controllers/IndexController.php9
-rw-r--r--application/modules/fbgui/views/scripts/index/index.phtml10
-rw-r--r--application/modules/user/controllers/FilterController.php58
3 files changed, 22 insertions, 55 deletions
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 91d045d..c66a3f5 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -11,10 +11,8 @@ class Fbgui_IndexController extends Zend_Controller_Action
public function indexAction()
{
$params = $this->_request->getParam('postdata');
-
if(isset($_SESSION['postdata'])){
$_POST = ($_SESSION['postdata']);
- #unset($_SESSION['postdata']);
}
if(isset($_POST['bootisoID']) || isset($_POST['serialnumber'])){
@@ -27,10 +25,11 @@ class Fbgui_IndexController extends Zend_Controller_Action
$bootisomapper->find($_POST['bootisoID'],$bootiso);
$groupID = $bootiso->getGroupID();
}
- elseif(isset($_POST['serialnumber'])){
-
+ elseif(isset($_POST['serialnumber'])){
$results = $bootisomapper->findBy('serialnumber',$_POST['serialnumber']);
- print_a($results);
+ if(count($results) == 0){
+ echo 'Your serialnumber is not known by the system';
+ }
$bootiso->setOptions($results[0]);
$bootiso->setID($results[0]['bootisoID']);
$groupID = $bootiso->getGroupID();
diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml
index 60ec5a8..4ed489c 100644
--- a/application/modules/fbgui/views/scripts/index/index.phtml
+++ b/application/modules/fbgui/views/scripts/index/index.phtml
@@ -5,6 +5,7 @@
$('.menu').removeClass('selected');
$(this).addClass('selected');
$("#selectedBootOs").val($(this).find('.id').val());
+ $("#startball").attr('src','/media/img/button-green.png');
});
});
function start(){
@@ -35,8 +36,9 @@
<input style="display:none;" type='text' id="selectedBootOs" />
- <div class="right" style='cursor:pointer;' onClick="start();">
- <img style='vertical-align:-8px;' src='/media/img/startOs.png'>
- <span style='font-size:18px;'>Start System</span>
- </div>
+ <button style='cursor:pointer;float:right;' onClick="start();">
+ <img id='startball' style='vertical-align:-3px;' src='/media/img/button-red.png'>
+ <span style='font-size:14px;'>Start System</span>
+ </button>
+ <div class='clear'></div>
<?php endif;?>
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index 934fd2e..70aa60b 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -179,6 +179,7 @@ class User_FilterController extends Zend_Controller_Action
else{
$this->_redirect('/user/filter/index/modifyresult/forbidden');
}
+ }
// TODO: ACL: he is allowed to edit the filter
elseif(true){
$filtermapper->save($newfilterentry);
@@ -354,30 +355,12 @@ class User_FilterController extends Zend_Controller_Action
else{
$newfilterenty->setFiltervalue($_POST['filtervalue']);
$newfilterenty->setFiltervalue2($_POST['filtervalue2']);
- }
-
- // check if it's the last groupID filterentry
- $allFilters = $filterentriesmapper->findBy('filterID',$filterentry->getFilterID());
- $lastfilter = true;
- foreach($allFilters as $thisFilterentry){
- if($thisFilterentry['filtertypeID'] == 6 && $thisFilterentry['filterentriesID'] != $filterentriesID){
- // one other filter with a groupID exists
- $lastfilter = false;
- }
- if($newfilterenty->getFiltertypeID() == 6){
- // this filter will be a GroupFilter
- $lastfilter = false;
- }
- }
- if($lastfilter){
- $pbsNotifier = new Pbs_Notifier();
- echo $pbsNotifier->notify('You cannot modify the last GroupFilter','forbidden');
- }
- else{
- $newfilter2 = new Application_Model_FilterEntriesMapper();
- $newfilter2->save($newfilterenty);
- $this->_redirect('/user/filter/index/modifyresult/ok');
- }
+ }
+
+ $newfilter2 = new Application_Model_FilterEntriesMapper();
+ $newfilter2->save($newfilterenty);
+ $this->_redirect('/user/filter/index/modifyresult/ok');
+
}
else{
$this->_redirect('/user/filter/index/modifyresult/forbidden');
@@ -409,28 +392,11 @@ class User_FilterController extends Zend_Controller_Action
try{
$deletefilterentry = new Application_Model_FilterEntries();
$deletefilterentry->setID($filterentriesID);
-
- // check if it's the last groupID filterentry
- $allFilters = $filterentriesmapper->findBy('filterID',$filterID);
- $lastfilter = true;
- foreach($allFilters as $thisFilterentry){
- if($thisFilterentry['filtertypeID'] == 6 && $thisFilterentry['filterentriesID'] != $filterentriesID){
- // one other filter with a groupID exists
- $lastfilter = false;
- }
- if($deletefilterentry->getFiltertypeID() == 6){
- // this filter will be a GroupFilter
- $lastfilter = false;
- }
- }
- if($lastfilter){
- $this->_redirect('/user/filter/index/deleteresult/forbidden');
- }
- else{
- $filterentriesmapper = new Application_Model_FilterEntriesMapper();
- $filterentriesmapper->delete($deletefilterentry);
- $this->_redirect('/user/filter/index/deleteresult/ok');
- }
+
+ $filterentriesmapper = new Application_Model_FilterEntriesMapper();
+ $filterentriesmapper->delete($deletefilterentry);
+ $this->_redirect('/user/filter/index/deleteresult/ok');
+
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
$this->_redirect('/user/filter/index/deleteresult/error');