diff --git a/module/doc/css/browse.css b/module/doc/css/browse.css index 2d5431227c..80cea2d24b 100644 --- a/module/doc/css/browse.css +++ b/module/doc/css/browse.css @@ -1,3 +1 @@ #mainContent .c-id > a {color: #0c60e1;} -.btn.ajaxCollect {width: 20px; padding: 0px;} -.btn.ajaxCollect > img {width: 20px;} diff --git a/module/doc/model.php b/module/doc/model.php index 476cc9c54f..e234373984 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1486,7 +1486,7 @@ class docModel extends model ->andWhere('vision')->eq($this->config->vision) ->andWhere('type')->eq($type) ->beginIF(!empty($appendLib))->orWhere('id')->eq($appendLib)->fi() - ->beginIF($type == 'mine')->orWhere('addedBy')->eq($this->app->user->account)->fi() + ->beginIF($type == 'mine')->andWhere('addedBy')->eq($this->app->user->account)->fi() ->orderBy('`order` asc, id_asc') ->fetchAll('id'); } diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php index 35d816a03d..d1bd49273f 100644 --- a/module/doc/view/lefttree.html.php +++ b/module/doc/view/lefttree.html.php @@ -418,6 +418,11 @@ $(function() methodName = 'showFiles'; linkParams = 'type=' + objectType + '&objectID=' + objectID; } + else if(objectType == 'mine') + { + methodName = 'browse'; + linkParams = 'type=mine&libID=' + libID; + } else if(['text', 'word', 'ppt', 'excel'].indexOf(type) !== -1) { methodName = 'view';