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

Many updates as a result of updating lnapp; added SSL service order

Browse Source
This commit is contained in:
Deon George
2016-06-05 22:33:12 +10:00
parent 44769e3de7
commit 0c7fe830a3
25 changed files with 384 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/classes/Controller/Admin/Module.php
View File

@@ -137,7 +137,7 @@ class Controller_Admin_Module extends Controller_Module {
Block::factory()
->title(sprintf('%s: %s ',_('Defined Module Methods For'),$mo->display('name')))
->title_icon('icon-cog')
->title_icon('fa fa-cog')
->body(Table::factory()
->data($methods['exist'])
->columns(array(
@@ -154,7 +154,7 @@ class Controller_Admin_Module extends Controller_Module {
Block::factory()
->title(sprintf('%s: %s ',_('Missing Module Methods For'),$mo->display('name')))
->title_icon('icon-exclamation-sign')
->title_icon('fa fa-question')
->body(Table::factory()
->data($methods['missing'])
->columns(array(
@@ -173,7 +173,7 @@ class Controller_Admin_Module extends Controller_Module {
public function action_list() {
Block::factory()
->title('Defined Modules')
->title_icon('icon-cog')
->title_icon('fa fa-cog')
->body(Table::factory()
->data(ORM::factory('Module')->where('parent_id','is',NULL)->find_all())
->jssort(TRUE)

8
application/classes/Controller/Admin/Module/Method.php
View File

@@ -37,7 +37,7 @@ class Controller_Admin_Module_Method extends Controller_Admin_Module {
Block::factory()
->title(sprintf(_('Add Method (%s) to Database for (%s)'),strtoupper($method),strtoupper($mo->name)))
->title_icon('icon-plus-sign')
->title_icon('fa fa-plus')
->type('form-horizontal')
->body(View::factory('module/method/admin/add')
->set('name',$method)
@@ -99,11 +99,9 @@ class Controller_Admin_Module_Method extends Controller_Admin_Module {
Block::factory()
->title(sprintf(_('Configure access to method (%s::%s)'),$mmo->controller(),$mmo->method()))
->title_icon('icon-plus-sign')
->title_icon('fa fa-lock')
->type('form')
->body(View::factory('module/method/admin/edit')
->set('o',$mmo)
);
->body(View::factory('module/method/admin/edit')->set('o',$mmo));
}
}
?>

2
application/classes/Menu.php
View File

@@ -30,7 +30,7 @@ class Menu extends lnApp_Menu {
return $result;
}
public static function items($type) {
public static function items($type,array $list=array()) {
$result = array();
if (empty(URL::$method_directory[$type]))

8
application/classes/ORM.php
View File

@@ -55,7 +55,6 @@ abstract class ORM extends lnApp_ORM {
/**
* Determine if the account is authoised by the user
*/
// @todo This function shouldnt be here.
public function authorised(Model $o=NULL,Model_Account $ao=NULL,$aid='account_id') {
if (is_null($o))
$o = $this;
@@ -147,6 +146,13 @@ abstract class ORM extends lnApp_ORM {
return ORM::factory('Module',array('name'=>$this->_table_name));
}
/**
* Name value return for the record
*/
public function name() {
return sprintf('Unknown [%s]',$this->id);
}
/**
* Set the site ID attribute for each row update
*/