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

6
modules/email/classes/Controller/Admin/Email.php
View File

@@ -28,7 +28,7 @@ class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
ORM::factory('Email_Log')->find_all(),
25,
array(
'id'=>array('label'=>'ID','url'=>'user/email/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','email/view/')),
'date_orig'=>array('label'=>'Date'),
'email'=>array('label'=>'To'),
'translate_resolve("subject")'=>array('label'=>'Subject'),
@@ -38,7 +38,7 @@ class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/email/view',
'form'=>URL::link('user','email/view'),
)),
));
}
@@ -108,7 +108,7 @@ class Controller_Admin_Email extends Controller_TemplateDefault_Admin {
$eto = ORM::factory('Email_Template',$id);
if (! $eto->loaded())
HTTP::redirect('email/admin/template/list');
HTTP::redirect(URL::link('admin','email/template/list'));
$output = '';

4
modules/email/classes/Controller/User/Email.php
View File

@@ -26,14 +26,14 @@ class Controller_User_Email extends Controller_TemplateDefault_User {
$this->ao->email_log->find_all(),
25,
array(
'id'=>array('label'=>'ID','url'=>'user/email/view/'),
'id'=>array('label'=>'ID','url'=>URL::link('user','email/view/')),
'date_orig'=>array('label'=>'Date'),
'translate_resolve("subject")'=>array('label'=>'Subject'),
),
array(
'page'=>TRUE,
'type'=>'select',
'form'=>'user/email/view',
'form'=>URL::link('user','email/view'),
)),
));
}