From bc67ec3e5a2a1f9e0acc164441ab600041afb7f5 Mon Sep 17 00:00:00 2001
From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Sun, 20 May 2012 23:54:42 +0200
Subject: [PATCH] Error fixed: removing updating node nested tree

Remove node and descendants.
Update node: whether it already has a parent or not
---
 .../modules/category/actions/actions.class.php     | 30 +++++++++++++++++-----
 lib/form/doctrine/CompanyCategoryForm.class.php    |  2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/apps/companyfront/modules/category/actions/actions.class.php b/apps/companyfront/modules/category/actions/actions.class.php
index 81c2a2c..153e4db 100644
--- a/apps/companyfront/modules/category/actions/actions.class.php
+++ b/apps/companyfront/modules/category/actions/actions.class.php
@@ -48,9 +48,10 @@ class categoryActions extends sfActions
     $userId = $this->getUser()->getGuardUser()->getId();
 
     //Get company owned by that user and insert value in form
-    $companyCategoryInit->company_id = CompanyTable::getInstance()->findOneByUserId($userId)->getId();
+    $companyUserId = CompanyTable::getInstance()->findOneByUserId($userId)->getId();
+    $companyCategoryInit->company_id = $companyUserId;
 
-    $this->form = new CompanyCategoryForm($companyCategoryInit, array('company_user_id' => CompanyTable::getInstance()->findOneByUserId($userId)->getId()));
+    $this->form = new CompanyCategoryForm($companyCategoryInit, array('company_user_id' => $companyUserId));
 
     $this->processForm($request, $this->form);
 
@@ -70,9 +71,9 @@ class categoryActions extends sfActions
     //Get id number sent by the user (never trust the users)
     $companyCategoryId = $request->getParameter('id');
 
-    $companyOfficeId = CompanyCategoryTable::getInstance()->findOneById($companyCategoryId)->getCompanyId();
+    $companyId = CompanyCategoryTable::getInstance()->findOneById($companyCategoryId)->getCompanyId();
 
-    $this->forward404Unless($companyOfficeId == $companyUserId, sprintf('Category does not exist (%s).', $request->getParameter('id')));
+    $this->forward404Unless($companyId == $companyUserId, sprintf('Category does not exist (%s).', $request->getParameter('id')));
 
     $this->form = new CompanyCategoryForm($company_category, array('company_user_id' => $companyUserId));
   }
@@ -91,9 +92,9 @@ class categoryActions extends sfActions
     //Get id number sent by the user (never trust the users)
     $companyCategoryId = $request->getParameter('id');
 
-    $companyOfficeId = CompanyCategoryTable::getInstance()->findOneById($companyCategoryId)->getCompanyId();
+    $companyId = CompanyCategoryTable::getInstance()->findOneById($companyCategoryId)->getCompanyId();
 
-    $this->forward404Unless($companyOfficeId == $companyUserId, sprintf('Category does not exist (%s).', $request->getParameter('id')));
+    $this->forward404Unless($companyId == $companyUserId, sprintf('Category does not exist (%s).', $request->getParameter('id')));
 
     $this->form = new CompanyCategoryForm($company_category, array('company_user_id' => $companyUserId));
 
@@ -107,7 +108,22 @@ class categoryActions extends sfActions
     $request->checkCSRFProtection();
 
     $this->forward404Unless($company_category = Doctrine_Core::getTable('CompanyCategory')->find(array($request->getParameter('id'))), sprintf('Object company_category does not exist (%s).', $request->getParameter('id')));
-    $company_category->delete();
+
+    //Get user Id
+    $userId = $this->getUser()->getGuardUser()->getId();
+
+    //Get company owned by that user
+    $companyUserId = CompanyTable::getInstance()->findOneByUserId($userId)->getId();
+
+    //Get id number sent by the user (never trust the users)
+    $companyCategoryId = $request->getParameter('id');
+
+    $companyId = CompanyCategoryTable::getInstance()->findOneById($companyCategoryId)->getCompanyId();
+
+    $this->forward404Unless($companyId == $companyUserId, sprintf('Category does not exist (%s).', $request->getParameter('id')));
+
+    //Delete node and its descendants
+    $company_category->getNode()->delete();
 
     $this->redirect('category/index');
   }
diff --git a/lib/form/doctrine/CompanyCategoryForm.class.php b/lib/form/doctrine/CompanyCategoryForm.class.php
index c01dc95..8249c07 100644
--- a/lib/form/doctrine/CompanyCategoryForm.class.php
+++ b/lib/form/doctrine/CompanyCategoryForm.class.php
@@ -42,7 +42,7 @@ class CompanyCategoryForm extends BaseCompanyCategoryForm
 
 
     //i18n (Internationalization)
-    $this->widgetSchema->getFormFormatter()->setTranslationCatalogue('company_categor_form');
+    $this->widgetSchema->getFormFormatter()->setTranslationCatalogue('company_category_form');
   }
 
   protected function doBind(array $values)
-- 
2.1.4