GeneralCategory, retrieve main using level 0.

diff --git a/apps/userfront/modules/category/templates/indexSuccess.php b/apps/userfront/modules/category/templates/indexSuccess.php
index b86a81c..dbe2b59 100644 (file)
--- a/apps/userfront/modules/category/templates/indexSuccess.php
+++ b/apps/userfront/modules/category/templates/indexSuccess.php
@@ -69,18 +69,14 @@
       }
       ?>>
       <td><a><?php echo $category ?></a></td>
-      <?php if ($node->getLevel() != '0'): ?>
-        <td><input type="checkbox" id="chosen" class="NFCheck" value="<?php echo $category->getId() ?>"
-        <?php foreach ($category->getUserBaskets() as $userBasket): ?>
-            <?php if ($userBasket->getUserId() == $userId): ?>
-                checked
-                <?php break ?>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        ></td>
-      <?php else: ?>
-        <td></td>
-      <?php endif; ?>
+      <td><input type="checkbox" id="chosen" class="NFCheck" value="<?php echo $category->getId() ?>"
+      <?php foreach ($category->getUserBaskets() as $userBasket): ?>
+          <?php if ($userBasket->getUserId() == $userId): ?>
+              checked
+              <?php break ?>
+          <?php endif; ?>
+      <?php endforeach; ?>
+      ></td>
     </tr>
     <?php endforeach; ?>
   </tbody>

diff --git a/lib/model/doctrine/GeneralCategoryTable.class.php b/lib/model/doctrine/GeneralCategoryTable.class.php
index a33719b..007abd0 100644 (file)
--- a/lib/model/doctrine/GeneralCategoryTable.class.php
+++ b/lib/model/doctrine/GeneralCategoryTable.class.php
@@ -19,13 +19,13 @@ class GeneralCategoryTable extends Doctrine_Table
 
 
     /**
-    * Returns general categories, ordered by lft field.
+    * Returns general categories skipping main category and ordered by lft field.
     *
     * @return Doctrine Query
     */
     public function getGeneralCategoriesByLftQuery()
     {
-        return $this->createQuery('gc')->where('gc.id != 1')
+        return $this->createQuery('gc')->where('gc.level != 0')
                                        ->orderBy('gc.lft');
     }
 }