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

* adjust for task #5044.

Browse Source
This commit is contained in:
wangyidong
2018-10-24 14:23:19 +08:00
parent fc480d0a01
commit eac9682bd7
6 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/control.php
+3 -3
View File
@@ -470,9 +470,9 @@ class custom extends control
{
if($this->server->request_method == 'POST')
{
$data = fixer::input('post')->get();
$this->loadModel('setting')->deleteItems("owner={$this->app->user->account}&module=doc&section=custom");
$this->setting->setItems("{$this->app->user->account}.doc.custom", $data);
$data = fixer::input('post')->join('showLibs', ',')->get();
$this->loadModel('setting')->deleteItems("owner={$this->app->user->account}&module=doc&section=custom&key=showLibs");
if($data)$this->setting->setItems("{$this->app->user->account}.doc.custom", $data);
die(js::reload('parent.parent'));
}
}
module/doc/config.php
+2 -3
View File
@@ -16,9 +16,8 @@ $config->doc->customObjectLibs = 'files,customFiles';
$config->doc->notArticleType = '';
$config->doc->custom = new stdclass();
$config->doc->custom->objectLibs = $config->doc->customObjectLibs;
$config->doc->custom->showProjects = 'all';
$config->doc->custom->showNullLib = false;
$config->doc->custom->objectLibs = $config->doc->customObjectLibs;
$config->doc->custom->showLibs = '';
$config->doc->editor = new stdclass();
$config->doc->editor->create = array('id' => 'content', 'tools' => 'fullTools');
module/doc/lang/en.php
+3 -4
View File
@@ -139,10 +139,9 @@ $lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star';
$lang->doc->customObjectLibs['files'] = 'Show File Library';
$lang->doc->customObjectLibs['customFiles'] = 'Show Custom Library';
$lang->doc->customShowLibs = 'Library display settings';
$lang->doc->customShowNullLib = 'Display empty library';
$lang->doc->customShowLibProjects['unclosed'] = 'Display projects that are not closed';
$lang->doc->customShowLibProjects['all'] = 'Display all projects';
$lang->doc->customShowLibs = 'Library display settings';
$lang->doc->customShowLibsList['zero'] = 'Display empty library';
$lang->doc->customShowLibsList['unclosed'] = 'Display projects that are not closed';
$lang->doc->confirmDelete = "Do you want to delete this document?";
$lang->doc->confirmDeleteLib = "Do you want to delete this Doc Lib?";
module/doc/lang/zh-cn.php
+3 -4
View File
@@ -139,10 +139,9 @@ $lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star';
$lang->doc->customObjectLibs['files'] = '显示附件库';
$lang->doc->customObjectLibs['customFiles'] = '显示自定义文档库';
$lang->doc->customShowLibs = '文档库显示设置';
$lang->doc->customShowNullLib = '显示空文档的库';
$lang->doc->customShowLibProjects['unclosed'] = '显示未关闭的项目';
$lang->doc->customShowLibProjects['all'] = '显示所有的项目';
$lang->doc->customShowLibs = '文档库显示设置';
$lang->doc->customShowLibsList['zero'] = '显示空文档的库';
$lang->doc->customShowLibsList['unclosed'] = '显示未关闭的项目';
$lang->doc->confirmDelete = "您确定删除该文档吗？";
$lang->doc->confirmDeleteLib = "您确定删除该文档库吗？";
module/doc/model.php
+10 -10
View File
@@ -137,7 +137,7 @@ class docModel extends model
$stmt = $this->dao->select('t1.*')->from(TABLE_DOCLIB)->alias('t1')
->leftJoin($table)->alias('t2')->on("t1.$type=t2.id")
->where("t1.$type")->ne(0)
->beginIF($type == 'project' and $this->config->doc->custom->showProjects == 'unclosed')->andWhere('t2.status')->notin('done,closed')->fi()
->beginIF($type == 'project' and strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi()
->andWhere('t1.deleted')->eq(0)
->orderBy("t2.order desc, t1.order, t1.id")
->query();
@@ -911,7 +911,7 @@ class docModel extends model
$fields = $type == 'product' ? "createdBy, createdDate" : "openedBy AS createdBy, openedDate AS createdDate";
$libs = $this->dao->select("id, name, `order`, {$fields}")->from($table)
->where('id')->in($idList)
->beginIF($type == 'project' and $this->config->doc->custom->showProjects == 'unclosed')->andWhere('status')->notin('done,closed')->fi()
->beginIF($type == 'project' and strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('status')->notin('done,closed')->fi()
->orderBy('`order` desc, id desc')
->page($pager, 'id')
->fetchAll('id');
@@ -971,7 +971,7 @@ class docModel extends model
$hasProject = $this->dao->select('DISTINCT product')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.product')->in($productIdList)
->beginIF($this->config->doc->custom->showProjects == 'unclosed')->andWhere('t2.status')->notin('done,closed')->fi()
->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi()
->andWhere('t2.deleted')->eq(0)
->fetchPairs('product', 'product');
}
@@ -995,7 +995,7 @@ class docModel extends model
}
$projects = $this->dao->select('id,name,status')->from(TABLE_PROJECT)
->where('id')->in(array_keys($projectLibs))
->beginIF($this->config->doc->custom->showProjects == 'unclosed')->andWhere('status')->notin('done,closed')->fi()
->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('status')->notin('done,closed')->fi()
->andWhere('deleted')->eq('0')
->orderBy('`order`_desc')
->fetchAll();
@@ -1033,7 +1033,7 @@ class docModel extends model
if($type == 'product' or $type == 'project')
{
$nonzeroLibs = array();
if($this->config->doc->custom->showNullLib)
if(strpos($this->config->doc->custom->showLibs, 'zero') !== false)
{
$nonzeroLibs = $this->dao->select('lib,count(*) as count')->from(TABLE_DOC)->where('deleted')->eq('0')->groupBy('lib')->having('count')->ne(0)->fetchPairs('lib', 'lib');
}
@@ -1042,8 +1042,8 @@ class docModel extends model
$stmt = $this->dao->select('t1.*')->from(TABLE_DOCLIB)->alias('t1')
->leftJoin($table)->alias('t2')->on("t1.$type=t2.id")
->where('t1.deleted')->eq(0)->andWhere("t1.$type")->ne(0)
->beginIF($type == 'project' and $this->config->doc->custom->showProjects == 'unclosed')->andWhere('t2.status')->notin('done,closed')->fi()
->beginIF($this->config->doc->custom->showNullLib)->andWhere('t1.id')->in($nonzeroLibs)->fi()
->beginIF($type == 'project' and strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi()
->beginIF(strpos($this->config->doc->custom->showLibs, 'zero') !== false)->andWhere('t1.id')->in($nonzeroLibs)->fi()
->orderBy("t2.`order` desc, t1.`order` asc, id desc")
->query();
}
@@ -1094,7 +1094,7 @@ class docModel extends model
$hasProject = $this->dao->select('DISTINCT product')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.product')->in($idList)
->beginIF($this->config->doc->custom->showProjects == 'unclosed')->andWhere('t2.status')->notin('done,closed')->fi()
->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi()
->andWhere('t2.deleted')->eq(0)
->fetchPairs('product', 'product');
}
@@ -1137,7 +1137,7 @@ class docModel extends model
$hasProject = $this->dao->select('DISTINCT product, count(project) as projectCount')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.product')->eq($objectID)
->beginIF($this->config->doc->custom->showProjects == 'unclosed')->andWhere('t2.status')->notin('done,closed')->fi()
->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t2.status')->notin('done,closed')->fi()
->andWhere('t2.deleted')->eq(0)
->groupBy('product')
->fetchPairs('product', 'projectCount');
@@ -1403,7 +1403,7 @@ class docModel extends model
->leftJoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.root=t2.project')
->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.root=t3.id')
->where('t2.product')->eq($objectID)
->beginIF($this->config->doc->custom->showProjects == 'unclosed')->andWhere('t3.status')->notin('done,closed')->fi()
->beginIF(strpos($this->config->doc->custom->showLibs, 'unclosed') !== false)->andWhere('t3.status')->notin('done,closed')->fi()
->andWhere('t1.type')->eq('project')
->andWhere('t3.deleted')->eq('0')
->fetchPairs('account', 'account');
module/doc/view/side.html.php
+1 -9
View File
@@ -154,15 +154,7 @@ if(empty($type)) $type = 'product';
<form action='<?php echo $this->createLink('custom', 'ajaxSetDoc');?>' target='hiddenwin' method='post'>
<table class='table table-form'>
<tr>
<td>
<div class="checkbox-primary">
<input type="checkbox" name="showNullLib" value="1" id="showNullLib1" <?php if($config->doc->custom->showNullLib) echo 'checked';?>>
<label for="showNullLib1"><?php echo $lang->doc->customShowNullLib;?></label>
</div>
</td>
</tr>
<tr>
<td><?php echo html::radio('showProjects', $lang->doc->customShowLibProjects, $config->doc->custom->showProjects);?></td>
<td><?php echo html::checkbox('showLibs', $lang->doc->customShowLibsList, $config->doc->custom->showLibs);?></td>
</tr>
<tr>
<td><?php echo html::submitButton();?></td>