* Fix block code style.
This commit is contained in:
@@ -203,6 +203,7 @@ $filter->block->main->get['blockTitle'] = 'reg::any';
|
||||
$filter->block->main->get['entry'] = 'code';
|
||||
$filter->block->main->get['lang'] = 'reg::lang';
|
||||
$filter->block->main->get['mode'] = 'code';
|
||||
$filter->block->main->get['dashboard'] = 'code';
|
||||
$filter->block->main->get['param'] = 'reg::base64';
|
||||
$filter->block->main->get['sso'] = 'reg::base64';
|
||||
|
||||
|
||||
@@ -65,6 +65,7 @@ class baseHelper
|
||||
/* 设置$appName和$moduleName。Set appName and moduleName. */
|
||||
global $app, $config;
|
||||
$programID = $programID ? $programID : $app->session->program;
|
||||
|
||||
if(strpos($moduleName, '.') !== false)
|
||||
{
|
||||
list($appName, $moduleName) = explode('.', $moduleName);
|
||||
|
||||
@@ -64,7 +64,8 @@ class block extends control
|
||||
}
|
||||
elseif(isset($this->lang->block->moduleList[$module]))
|
||||
{
|
||||
$module == 'program' ? $this->get->set('mode', 'getprogramlist') : $this->get->set('mode', 'getblocklist');
|
||||
$this->get->set('mode', 'getblocklist');
|
||||
if($module == 'program') $this->get->set('dashboard', 'program');
|
||||
$this->view->blocks = $this->fetch('block', 'main', "module=$module&id=$id");
|
||||
$this->view->module = $module;
|
||||
}
|
||||
@@ -410,10 +411,10 @@ class block extends control
|
||||
|
||||
$mode = strtolower($this->get->mode);
|
||||
|
||||
if($mode == 'getblocklist' || $mode == 'getprogramlist')
|
||||
if($mode == 'getblocklist')
|
||||
{
|
||||
$type = $mode == 'getblocklist' ? '' : 'program';
|
||||
$blocks = $this->block->getAvailableBlocks($module, $type);
|
||||
$dashboard = $this->get->dashboard;
|
||||
$blocks = $this->block->getAvailableBlocks($module, $dashboard);
|
||||
if(!$this->selfCall)
|
||||
{
|
||||
echo $blocks;
|
||||
|
||||
@@ -250,10 +250,10 @@ class blockModel extends model
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
public function getAvailableBlocks($module = '', $type = '')
|
||||
public function getAvailableBlocks($module = '', $dashboard = '')
|
||||
{
|
||||
$blocks = $this->lang->block->availableBlocks;
|
||||
if($type == 'program')
|
||||
if($dashboard == 'program')
|
||||
{
|
||||
$programID = $this->session->program;
|
||||
$program = $this->loadModel('project')->getByID($programID);
|
||||
|
||||
Reference in New Issue
Block a user