Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of git@github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
azhi
2013-08-08 09:57:35 +08:00
parent e4d27b3a67 2b42181852
commit c8bf1a9d2a
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/common/model.php
View File

@@ -129,6 +129,7 @@ class commonModel extends model
if(!$this->config->db->name) return;
$records = $this->loadModel('custom')->getAll();
if(!$records) return;
$this->lang->db = new stdclass();
$this->lang->db->custom = $records;
}

2
module/custom/control.php
View File

@@ -56,7 +56,7 @@ class custom extends control
$this->view->position[] = $this->lang->custom->common;
$this->view->position[] = $this->lang->custom->$module;
$this->view->fieldList = $fieldList;
$this->view->dbFields = $this->custom->getItems("module=$module&section=$field");
$this->view->dbFields = $this->custom->getItems("lang=$currentLang,all&module=$module&section=$field");
$this->view->field = $field;
$this->view->module = $module;
$this->view->currentLang = $currentLang;

1
module/webapp/control.php
View File

@@ -57,6 +57,7 @@ class webapp extends control
if($type == 'bysearch') $param = helper::safe64Encode($this->post->key);
/* Get results from the api. */
$recPerPage = $this->cookie->pagerWebappObtain ? $this->cookie->pagerWebappObtain : $recPerPage;
$results = $this->webapp->getAppsByAPI($type, $param, $recTotal, $recPerPage, $pageID);
if($results)
{