From adfd61aa66aceca34ed464125fc00723ea7d6ebb Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 22 Feb 2019 10:36:16 +0800 Subject: [PATCH] * finish task #5275. --- module/doc/control.php | 8 ++- module/doc/css/alllibs.css | 4 -- module/doc/css/index.css | 13 ----- module/doc/js/common.js | 1 - module/doc/lang/zh-cn.php | 3 +- module/doc/view/side.html.php | 92 ++++++++++++++++++++++++++++++++++- module/doc/view/sort.html.php | 9 ++++ module/task/model.php | 4 +- 8 files changed, 111 insertions(+), 23 deletions(-) delete mode 100644 module/doc/css/alllibs.css create mode 100644 module/doc/view/sort.html.php diff --git a/module/doc/control.php b/module/doc/control.php index 32405ffcae..7c309b241e 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -532,7 +532,7 @@ class doc extends control * @access public * @return void */ - public function sort() + public function sort($type = '') { if($_POST) { @@ -543,6 +543,12 @@ class doc extends control if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->send(array('result' => 'success')); } + + if($type) + { + $this->view->libs = $this->doc->getLibs($type); + $this->display(); + } } /** diff --git a/module/doc/css/alllibs.css b/module/doc/css/alllibs.css deleted file mode 100644 index 515312e555..0000000000 --- a/module/doc/css/alllibs.css +++ /dev/null @@ -1,4 +0,0 @@ -#libs .libs-group-heading{border:1px solid #ddd;overflow:hidden} -#libs .libs-group{border:1px solid #ddd; border-top:0px;overflow:hidden; margin-bottom:20px;} -#libs .libs-group.libs-custom{border-top:1px solid #ddd;overflow:hidden; margin-bottom:20px;} -#libs .lib-custom{width:130px; margin-bottom:10px;} diff --git a/module/doc/css/index.css b/module/doc/css/index.css index f07a46ead0..8e943f4aa7 100644 --- a/module/doc/css/index.css +++ b/module/doc/css/index.css @@ -1,14 +1 @@ -.lib-heading{border-right:1px solid #ddd;} -.lib-more a.more{font-weight:bold; display:block;} -#libs .libs-group-heading{border:1px solid #ddd;} -#libs .libs-group{border:1px solid #ddd; border-top:0px; margin-bottom:20px;} -#libs .libs-group.lib-more{border:0px; text-align:center; height:120px; line-height:110px;} -#libs .libs-group.lib-more:hover{background-color: #EBF2F9} -#libs .libs-custom-heading{text-align:center; height:120px; line-height:110px; position: relative; margin-bottom:20px;} -#libs .libs-custom-heading:hover{background-color: #EBF2F9} -#libs .libs-custom-heading a{display:block;height:100%;} -#libs .libs-custom-heading .lable-custom{position: absolute;left:8px;} -#libs hr {margin-top:0px;} -#libs .panel-body {overflow: auto; max-height: 224px;} - #pageActions ul.dropdown-menu{left: 67px} diff --git a/module/doc/js/common.js b/module/doc/js/common.js index 0c030b430c..262d702e68 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -80,7 +80,6 @@ $(document).ready(function() } }, 'json'); } - }); 'use strict'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 867064191a..e0c57bfa8f 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -141,7 +141,8 @@ $lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star'; $lang->doc->customObjectLibs['files'] = '显示附件库'; $lang->doc->customObjectLibs['customFiles'] = '显示自定义文档库'; -$lang->doc->customShowLibs = '文档库显示设置'; +$lang->doc->orderLib = '文档库排序'; +$lang->doc->customShowLibs = '显示设置'; $lang->doc->customShowLibsList['zero'] = '显示空文档的库'; $lang->doc->customShowLibsList['unclosed'] = '只显示未关闭的项目'; diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index a7722821ff..749e73e40d 100644 --- a/module/doc/view/side.html.php +++ b/module/doc/view/side.html.php @@ -161,7 +161,20 @@ if(empty($type)) $type = 'product'; -
{$lang->doc->customShowLibs}", '', "class='setting text-secondary small' data-target='#settingModal' data-toggle='modal'");?>
+
+
+ {$lang->doc->customShowLibs}", '', "class='setting text-secondary small' data-target='#settingModal' data-toggle='modal'");?> +
+
+ doc->orderLib}", '', "id='orderLib' class='text-secondary small " . (($type != 'product' and $type !='project') ? '' : 'hidden') . "'"); + echo html::a('javascript:cancelOrder()', " {$lang->goback}", '', "id='cancelOrder' class='text-secondary small hidden'"); + } + ?> +
+
+goback);?> + diff --git a/module/doc/view/sort.html.php b/module/doc/view/sort.html.php new file mode 100644 index 0000000000..4dd7053b36 --- /dev/null +++ b/module/doc/view/sort.html.php @@ -0,0 +1,9 @@ +
+ + $libName):?> +
+ +
diff --git a/module/task/model.php b/module/task/model.php index bc80ca5df4..9c5bb36250 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -626,7 +626,7 @@ class taskModel extends model if($task->consumed < $oldTask->consumed) die(js::error($this->lang->task->error->consumedSmall)); /* Fix bug#1388, Check children task projectID and moduleID. */ - if($task->project != $oldTask->project) + if(isset($task->project) and $task->project != $oldTask->project) { $this->dao->update(TABLE_TASK)->set('project')->eq($task->project)->set('module')->eq($task->module)->where('parent')->eq($taskID)->exec(); } @@ -705,7 +705,7 @@ class taskModel extends model { if($task->status == 'done') $this->loadModel('score')->create('task', 'finish', $taskID); if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID); - if($task->parent) + if(!empty($task->parent)) { $this->dao->update(TABLE_TASK)->set('parent')->eq(-1)->where('id')->eq($task->parent)->exec(); $this->updateParentStatus($taskID);