From bc4de003db0223c0d170883ad40d18231d2917d6 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 12 Apr 2023 10:20:11 +0800 Subject: [PATCH 1/4] * Code for bug #34052. --- module/doc/view/myspace.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/view/myspace.html.php b/module/doc/view/myspace.html.php index 6ed9f3b87a..fd2a4d5f4f 100644 --- a/module/doc/view/myspace.html.php +++ b/module/doc/view/myspace.html.php @@ -41,7 +41,7 @@ echo html::a(helper::createLink('doc', 'createLib', "type=mine"), ' ' . $this->lang->doc->createLib, '', 'class="btn btn-secondary iframe" data-width="800px"'); } - if($libID and common::hasPriv('doc', 'create')) echo $this->doc->printCreateBtn($lib, 'mine', 0, 0); + if($libID and common::hasPriv('doc', 'create')) echo $this->doc->printCreateBtn($lib, 'mine', 0, $moduleID); ?> From 26b79296d4b72c1365809276f9bcc9d384d9f2fa Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 12 Apr 2023 10:38:22 +0800 Subject: [PATCH 2/4] * Code for bug #34013, task #90781. --- module/block/view/docrecentupdateblock.html.php | 13 +++++++++++-- module/block/view/docstatisticblock.html.php | 11 +---------- module/doc/model.php | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/module/block/view/docrecentupdateblock.html.php b/module/block/view/docrecentupdateblock.html.php index d5ba89ab49..fc9fbd763f 100644 --- a/module/block/view/docrecentupdateblock.html.php +++ b/module/block/view/docrecentupdateblock.html.php @@ -12,7 +12,7 @@ ?> +
- + + + +
+ editInterval; @@ -51,7 +56,11 @@ ?>

title;?>

doc->editedDate . (common::checkNotCN() ? ': ' : '：') . $doc->editedDate;?>

+ + +
+
diff --git a/module/block/view/docstatisticblock.html.php b/module/block/view/docstatisticblock.html.php index 49815f2353..ce54c45dcf 100644 --- a/module/block/view/docstatisticblock.html.php +++ b/module/block/view/docstatisticblock.html.php @@ -17,18 +17,12 @@ .block-docstatistic .created {flex: 0 1 48%;} .block-docstatistic .edited {flex: 0 1 16%; padding-left: 20px;} .block-docstatistic .divider {border-right: 1px solid #eee; padding-right: 12%;} -.block-docstatistic .title-line {height: 32px;} -.block-docstatistic .panel-title {display: none;} -.block-docstatistic .panel-body {margin-top: -32px; padding: 30px;} -.block-docstatistic .tile-title {white-space: nowrap;} +.block-docstatistic .panel-body {padding-top: 0;} .block-docstatistic.block-sm .flex {justify-content: start;} .block-docstatistic.block-sm .panel-body.flex {flex-direction: column;} .block-docstatistic.block-sm .divider {border-right: none;} -.block-docstatistic.block-sm .panel-title {display: block;} -.block-docstatistic.block-sm .statistic .title-line {display: none;} .block-docstatistic.block-sm .statistic .flex {margin-top: -28px;} -.block-docstatistic.block-sm .title-line {height: 0; padding-top: 10px;} .block-docstatistic.block-sm .tile {padding: 10px 32px 20px;} .block-docstatistic.block-sm .panel-body {margin-top: 0px; padding: 10px;} .block-docstatistic.block-sm .flex-column .flex .tile:nth-child(1) {padding-left: 0;} @@ -39,7 +33,6 @@
-

doc->docStatistic;?>

totalDocs;?>
@@ -52,7 +45,6 @@
-

doc->openedByMe;?>

@@ -77,7 +69,6 @@
-

doc->editedByMe;?>

myEditedDocs;?>
diff --git a/module/doc/model.php b/module/doc/model.php index c958e291d6..c2b9ebd7f8 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2990,6 +2990,7 @@ class docModel extends model $docIDList = $this->getPrivDocs($lib->id); $docs = $this->dao->select('*, title as name')->from(TABLE_DOC) ->where('id')->in($docIDList) + ->andWhere("(status = 'normal' or (status = 'draft' and addedBy='{$this->app->user->account}'))") ->andWhere('deleted')->eq(0) ->andWhere('module')->eq(0) ->fetchAll('id'); From 493e4a858979a3334d81358f46e1d33986be54b0 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 12 Apr 2023 11:10:01 +0800 Subject: [PATCH 3/4] * Modify no data tips. --- module/block/view/docrecentupdateblock.html.php | 9 +++++++-- module/doc/control.php | 5 +---- module/doc/model.php | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/module/block/view/docrecentupdateblock.html.php b/module/block/view/docrecentupdateblock.html.php index fc9fbd763f..3321d13b61 100644 --- a/module/block/view/docrecentupdateblock.html.php +++ b/module/block/view/docrecentupdateblock.html.php @@ -18,15 +18,17 @@ .block-docrecentupdate .doc-list > .doc-item .file-icon {float: left; padding: 8px 4px;} .block-docrecentupdate .doc-list > .doc-item > .plug-title {height: 16px; overflow: hidden;} .block-docrecentupdate .doc-list > .doc-item .edit-date {overflow: hidden; height: 16px;} +.block-docrecentupdate .no-doc {text-align: center; vertical-align: middle; height: 50px;} .block-docrecentupdate.block-sm .doc-list > .doc-item {flex: 1 1 100%;}
+
- +
@@ -56,12 +58,15 @@ ?>

title;?>

doc->editedDate . (common::checkNotCN() ? ': ' : '：') . $doc->editedDate;?>

- +
+ +
doc->noDoc;?>
+
diff --git a/module/doc/control.php b/module/doc/control.php index ec02fc78ab..950ac4e2d8 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -1147,11 +1147,11 @@ class doc extends control if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found')); return print(js::error($this->lang->notFound) . js::locate($this->inlink('index'))); } + if(!$this->doc->checkPrivDoc($doc)) return $this->accessDenied(); $lib = $this->doc->getLibById($doc->lib); if(!empty($lib) and $lib->deleted == '1') $appendLib = $doc->id; - $objectType = isset($lib->type) ? $lib->type : 'custom'; $type = $objectType == 'execution' && $this->app->tab != 'execution' ? 'project' : $objectType; $objectID = zget($doc, $type, 0); @@ -1162,9 +1162,6 @@ class doc extends control /* Get doc. */ if($docID) { - $doc = $this->doc->getById($docID, $version, true); - if(!$doc) return print(js::error($this->lang->notFound)); - $this->doc->createAction($docID, 'view'); $this->doc->removeEditing($doc); if($doc->keywords) diff --git a/module/doc/model.php b/module/doc/model.php index c2b9ebd7f8..82c8bddd2f 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -3146,7 +3146,7 @@ class docModel extends model */ public function printCreateBtn($lib, $type, $objectID, $moduleID, $from = '') { - if(!common::hasPriv('doc', 'create')) return null; + if(!common::hasPriv('doc', 'create') or !isset($lib->id)) return null; $class = $from == 'list' ? 'btn-info' : 'btn-primary'; $html = "
"; From 1b9bbe097d47c95bb5cf9f3c9bd65993885b2fbf Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 12 Apr 2023 11:23:05 +0800 Subject: [PATCH 4/4] * Code for bug #34060. --- module/doc/control.php | 3 +-- module/doc/model.php | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 950ac4e2d8..112edb6961 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -1142,12 +1142,11 @@ class doc extends control public function view($docID = 0, $version = 0, $appendLib = 0) { $doc = $this->doc->getById($docID); - if(!$doc) + if(!$doc or !isset($doc->id)) { if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found')); return print(js::error($this->lang->notFound) . js::locate($this->inlink('index'))); } - if(!$this->doc->checkPrivDoc($doc)) return $this->accessDenied(); $lib = $this->doc->getLibById($doc->lib); if(!empty($lib) and $lib->deleted == '1') $appendLib = $doc->id; diff --git a/module/doc/model.php b/module/doc/model.php index 82c8bddd2f..dcb5c0cd2d 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -766,7 +766,7 @@ class docModel extends model echo(js::alert($this->lang->doc->accessDenied)); $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login"; if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(inlink('index'))); - return print(js::locate('back')); + helper::end(print(js::locate('back'))); } $docs = $this->processCollector(array($doc->id => $doc)); @@ -1320,6 +1320,8 @@ class docModel extends model */ public function checkPrivDoc($object) { + if(!isset($object->lib)) return false; + $libType = $this->dao->select('type')->from(TABLE_DOCLIB)->where('id')->eq($object->lib)->fetch('type'); if($this->app->user->admin and $libType != 'mine') return true; @@ -2807,7 +2809,7 @@ class docModel extends model public function checkAutoloadPage($doc) { $autoloadPage = true; - if(!empty($doc) and $doc->type == 'url') + if(isset($doc->type) and $doc->type == 'url') { if(empty($doc->content)) return false;