Fixes for render AJAX HTMLRender objects
This commit is contained in:
parent
609a72425b
commit
98a36554ae
@ -1 +1 @@
|
|||||||
Subproject commit 8ba0ced1911cc1a824088a28a4008cf647de9f41
|
Subproject commit 5064f0899925bc2b866937cc30a671c32fb528e7
|
@ -34,7 +34,7 @@ class Controller_Admin_Product extends Controller_Product {
|
|||||||
->set('o',$pto);
|
->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);
|
->set('o',$pcto);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->response->body($output);
|
$this->template->content = $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -44,6 +44,13 @@ class Model_Product extends ORM_OSB {
|
|||||||
'price_group',
|
'price_group',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Which categories is this product available in
|
||||||
|
*/
|
||||||
|
public function categories() {
|
||||||
|
return $this->avail_category;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the translated description for a category.
|
* Return the translated description for a category.
|
||||||
*/
|
*/
|
||||||
|
@ -24,6 +24,10 @@ class Model_Product_Category extends ORM_OSB {
|
|||||||
'subcategories'=>array('model'=>'product_category','foreign_key'=>'parent_id','far_key'=>'id'),
|
'subcategories'=>array('model'=>'product_category','foreign_key'=>'parent_id','far_key'=>'id'),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
protected $_sorting = array(
|
||||||
|
'position'=>'ASC',
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the translated description for a category.
|
* Return the translated description for a category.
|
||||||
*/
|
*/
|
||||||
|
@ -24,3 +24,4 @@
|
|||||||
'help-block'=>'Complete description of this category')); ?>
|
'help-block'=>'Complete description of this category')); ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<?php echo Script::factory()->render_all(); ?>
|
||||||
|
@ -16,3 +16,4 @@
|
|||||||
'help-block'=>'Complete description of this category')); ?>
|
'help-block'=>'Complete description of this category')); ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<?php echo Script::factory()->render_all(); ?>
|
||||||
|
Reference in New Issue
Block a user