molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、更新tp5内核

Browse Source 
2、修复后台文档模型创建的bug
This commit is contained in:
molong
2016-08-05 17:32:10 +08:00
parent 4b09ebce88
commit bce968f5a3
12 changed files with 165 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/common/model/Content.php
View File

@@ -58,6 +58,6 @@ class Content extends Base{
}
public function del($map){
return $this->db()->where($map)->delete();
return $this->where($map)->delete();
}
}

2
application/common/model/Document.php
View File

@@ -104,7 +104,7 @@ class Document extends \think\model\Merge{
}
public function del($map){
return $this->db()->where($map)->delete();
return $this->where($map)->delete();
}
public function detail($id){

45
application/common/model/Model.php
View File

@@ -46,37 +46,34 @@ class Model extends Base{
*/
public function change() {
if(IS_POST){
$data = input('post.',array());
$data = \think\Request::instance()->post();
if($data){
if (empty($data['id'])) {
/*创建表*/
$db = new \com\Datatable();
//文档模型
if($data['extend'] == 1){
//默认文档前缀
$tablename = 'document_'.$data['name'];
$is_auto_increment = false;
if ($data['extend'] == 1) {
//文档模型
$sql = $db->start_table('document_'.$data['name'])->create_id('doc_id', 11 , '主键' , false)->create_key('doc_id');
}else{
$tablename = $data['name'];
$is_auto_increment = true;
$sql = $db->start_table($data['name'])->create_id('id', 11 , '主键' , true)->create_uid()->create_key('id');
}
$sql = $db->start_table($tablename)
->create_id('id', 11 , '主键' , $is_auto_increment);
if ($data['extend'] != 1) {
$sql = $sql->create_uid();
}
$sql->create_key('id')->end_table($data['title'], $data['engine_type'])
->create();
$id = $this->validate('model.add')->save($data);
if (false === $id) {
return array('info'=>$this->getError(), 'status'=>0);
//执行操作数据库，建立数据表
$result = $sql->end_table($data['title'], $data['engine_type'])->create();
if ($result) {
$id = $this->validate('model.add')->save($data);
if (false === $id) {
return array('info'=>$this->getError(), 'status'=>0);
}else{
// 清除模型缓存数据
cache('document_model_list', null);
//记录行为
action_log('update_model', 'model', $id, session('auth_user.uid'));
return $id ? array('info'=>'创建模型成功！','status'=>1) : array('info'=>'创建模型失败！','status'=>1);
}
}else{
// 清除模型缓存数据
cache('document_model_list', null);
//记录行为
action_log('update_model', 'model', $id, session('auth_user.uid'));
return $id ? array('info'=>'创建模型成功！','status'=>1) : array('info'=>'创建模型失败！','status'=>1);
return false;
}
} else {
//修改