deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Optimised Company() Setup() Config() and changed method_directory into URL

Browse Source
This commit is contained in:
Deon George
2013-02-12 22:14:59 +11:00
parent 97d894d472
commit 288d974cfa
63 changed files with 422 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/product/classes/Controller/Admin/Product.php
View File

@@ -49,7 +49,7 @@ class Controller_Admin_Product extends Controller_TemplateDefault_Admin {
$prods,
25,
array(
'id'=>array('label'=>'ID','url'=>'admin/product/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('admin','product/view/')),
'name()'=>array('label'=>'Details'),
'status'=>array('label'=>'Active'),
'prod_plugin_file'=>array('label'=>'Plugin Name'),
@@ -62,7 +62,7 @@ class Controller_Admin_Product extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'admin/product/view',
'form'=>URL::link('admin','product/view'),
)),
));
}
@@ -102,7 +102,7 @@ class Controller_Admin_Product extends Controller_TemplateDefault_Admin {
data: "key="+$(this).val(),
dataType: "html",
cache: false,
url: "'.URL::site('admin/product/ajaxtranslateform/'.$po->id).'",
url: "'.URL::link('admin','product/ajaxtranslateform/'.$po->id,TRUE).'",
timeout: 2000,
error: function(x) {
alert("Failed to submit");
@@ -125,7 +125,7 @@ class Controller_Admin_Product extends Controller_TemplateDefault_Admin {
ORM::factory('Service')->where('product_id','=',$po->id)->find_all(),
25,
array(
'id'=>array('label'=>'ID','url'=>'user/service/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','service/view/')),
'account->accnum()'=>array(),
'account->name()'=>array('label'=>'Account'),
'name()'=>array('label'=>'Details'),
@@ -135,7 +135,7 @@ class Controller_Admin_Product extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/service/view',
'form'=>URL::link('user','service/view'),
)),
));
}

4
modules/product/classes/Model/Product/Category.php
View File

@@ -25,9 +25,9 @@ class Model_Product_Category extends ORM_OSB {
// If the user is not logged in, show the site default language
// @todo This needs to change to the session language.
if (! $ao=Auth::instance()->get_user())
$ao=Config::instance()->so;
$ao=Company::instance()->so();
return ($a=$this->product_category_translate->where('language_id','=',$ao->language_id)->find()->description) ? $a : _('No Description');
return ($x=$this->product_category_translate->where('language_id','=',$ao->language_id)->find()->description) ? $x : _('No Description');
}
/**