diff --git a/modules/lnApp b/modules/lnApp index 8ba0ced1..5064f089 160000 --- a/modules/lnApp +++ b/modules/lnApp @@ -1 +1 @@ -Subproject commit 8ba0ced1911cc1a824088a28a4008cf647de9f41 +Subproject commit 5064f0899925bc2b866937cc30a671c32fb528e7 diff --git a/modules/product/classes/Controller/Admin/Product.php b/modules/product/classes/Controller/Admin/Product.php index a8abc48c..3cb3a54a 100644 --- a/modules/product/classes/Controller/Admin/Product.php +++ b/modules/product/classes/Controller/Admin/Product.php @@ -34,7 +34,7 @@ class Controller_Admin_Product extends Controller_Product { ->set('o',$pto); } - $this->response->body($output); + $this->template->content = $output; } /** @@ -53,7 +53,7 @@ class Controller_Admin_Product extends Controller_Product { ->set('o',$pcto); } - $this->response->body($output); + $this->template->content = $output; } /** diff --git a/modules/product/classes/Model/Product.php b/modules/product/classes/Model/Product.php index cf77bb64..092a980d 100644 --- a/modules/product/classes/Model/Product.php +++ b/modules/product/classes/Model/Product.php @@ -44,6 +44,13 @@ class Model_Product extends ORM_OSB { 'price_group', ); + /** + * Which categories is this product available in + */ + public function categories() { + return $this->avail_category; + } + /** * Return the translated description for a category. */ diff --git a/modules/product/classes/Model/Product/Category.php b/modules/product/classes/Model/Product/Category.php index 2f309ef8..cda202c2 100644 --- a/modules/product/classes/Model/Product/Category.php +++ b/modules/product/classes/Model/Product/Category.php @@ -24,6 +24,10 @@ class Model_Product_Category extends ORM_OSB { 'subcategories'=>array('model'=>'product_category','foreign_key'=>'parent_id','far_key'=>'id'), ); + protected $_sorting = array( + 'position'=>'ASC', + ); + /** * Return the translated description for a category. */ diff --git a/modules/product/views/product/admin/ajaxtranslate.php b/modules/product/views/product/admin/ajaxtranslate.php index 1f5950fd..1bbb03fb 100644 --- a/modules/product/views/product/admin/ajaxtranslate.php +++ b/modules/product/views/product/admin/ajaxtranslate.php @@ -24,3 +24,4 @@ 'help-block'=>'Complete description of this category')); ?> +render_all(); ?> diff --git a/modules/product/views/product/category/admin/ajaxtranslate.php b/modules/product/views/product/category/admin/ajaxtranslate.php index d1df505f..fa621ea1 100644 --- a/modules/product/views/product/category/admin/ajaxtranslate.php +++ b/modules/product/views/product/category/admin/ajaxtranslate.php @@ -16,3 +16,4 @@ 'help-block'=>'Complete description of this category')); ?> +render_all(); ?>