From f86695c9c35395acca0fff43bf921d84b754507c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCller?= <mueller@miconware.de>
Date: Tue, 21 Oct 2014 19:00:46 +0200
Subject: [PATCH] =?UTF-8?q?#102=20Beschr=C3=A4nkung=20Stellen=20-=20richti?=
 =?UTF-8?q?ges=20L=C3=B6schen=20deaktivieren?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/Component/MiconwareSessionComponent.php |  1 +
 app/Controller/JobController.php                       | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Controller/Component/MiconwareSessionComponent.php b/app/Controller/Component/MiconwareSessionComponent.php
index 85ad79a..94afc04 100755
--- a/app/Controller/Component/MiconwareSessionComponent.php
+++ b/app/Controller/Component/MiconwareSessionComponent.php
@@ -115,6 +115,7 @@ class MiconwareSessionComponent extends Component {
 	public static function getOpeningCondition(){
 		return array('and'=>array(
 			'DreamjobJobOpening.active'=>true,
+			'DreamjobJobOpening.delete'=>false,
 			'DreamjobJobOpening.startdate <='=> date("Y-m-d"),
 			'DreamjobJobOpening.enddate >='=> date("Y-m-d", strtotime("+1 day"))
 		));
diff --git a/app/Controller/JobController.php b/app/Controller/JobController.php
index ca7a346..3ab6786 100644
--- a/app/Controller/JobController.php
+++ b/app/Controller/JobController.php
@@ -35,13 +35,15 @@ class JobController extends AppController {
             if (!empty($this->request->query['del'])) {
                 $o = $this->DreamjobJobOpening->findById($this->request->query['del']);
                 if ($o['AppUser']['id'] == $self['AppUser']['id']) {
-                    $this->DreamjobJobOpening->delete($this->request->query['del'], false);
+                    $o['DreamjobJobOpening']['delete']=true;
+                    $o['DreamjobJobOpening']['active']=false;
+                    $this->DreamjobJobOpening->save($o);
                     $this->MiconwareSession->setFlash(__('dreamjob.opening.delete.success'), 'flash', array('alert' => 'success'));
                 } else {
                     $this->MiconwareSession->setFlash(__('dreamjob.opening.delete.error'), 'flash', array('alert' => 'danger'));
                 }
             }
-            $openings = $this->DreamjobJobOpening->find('all', array('conditions' => array('DreamjobJobOpening.company_id' => $self['AppUser']['id'])));
+            $openings = $this->DreamjobJobOpening->find('all', array('conditions' => array('DreamjobJobOpening.company_id' => $self['AppUser']['id'],'DreamjobJobOpening.delete'=>false)));
             $this->set('openings', $openings);
             $this->render('/Job/opening_list');
         }
@@ -94,14 +96,14 @@ class JobController extends AppController {
         if (!empty($this->request->params['id'])) {
             $load = $this->DreamjobJobOpening->findById($this->request->params['id']);
             $cid = $a['AppUser']['id'];
-            if (!empty($load) and $load['DreamjobJobOpening']['company_id'] == $cid) {
+            if (!empty($load) and $load['DreamjobJobOpening']['company_id'] == $cid and $load['DreamjobJobOpening']['delete']==false) {
                 if ($this->request->is(array('post', 'put'))) {
                     $this->DreamjobJobOpening->create($this->request->data);
                     $this->DreamjobJobOpening->data['DreamjobJobOpening']['id'] = $this->request->params['id'];
                     $this->DreamjobJobOpening->data['DreamjobJobOpening']['company_id'] = $cid;
                     if ($this->DreamjobJobOpening->save($this->DreamjobJobOpening->data)) {
                         $this->MiconwareSession->setFlash(__('dreamjob.opening.save.success'), 'flash', array('alert' => 'success'));
-                        if($this->request->data['DreamjobJobOpening']['active'] and $this->request->data['DreamjobJobOpening']['startdate'] <= date("Y-m-d") and $this->request->data['DreamjobJobOpening']['enddate'] >= date("Y-m-d", strtotime("+1 day") ) )
+                        if($this->request->data['DreamjobJobOpening']['active'] and $this->request->data['DreamjobJobOpening']['startdate'] <= date("Y-m-d") and $this->request->data['DreamjobJobOpening']['enddate'] >= date("Y-m-d", strtotime("+1 day") ))
                             return $this->redirect(array('action' => 'openingGet','id'=>$this->request->params['id']));
                     } else
                         $this->MiconwareSession->setFlash(__('dreamjob.opening.save.error'), 'flash', array('alert' => 'danger'));