Merge branch 'cyy_fixbug' into 'master'

Cyy fixbug

See merge request easycorp/zentaopms!7457

module/block/lang/de.php

@@ -358,6 +358,8 @@ if($config->vision == 'rnd')
     $lang->block->default['doc']['6']['title'] = $lang->productCommon . ' Document';
     $lang->block->default['doc']['6']['block'] = 'productdoc';
     $lang->block->default['doc']['6']['grid']  = 8;
+
+    $lang->block->default['doc']['6']['params']['count'] = '20';
 }
 
 $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard';
@@ -368,6 +370,8 @@ $lang->block->default['doc']['8']['title'] = $lang->projectCommon . ' Document';
 $lang->block->default['doc']['8']['block'] = 'projectdoc';
 $lang->block->default['doc']['8']['grid']  = 8;
 
+$lang->block->default['doc']['8']['params']['count'] = '20';
+
 $lang->block->count   = 'Count';
 $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Order by';
@@ -458,7 +462,7 @@ $lang->block->modules['doc']->availableBlocks->docdynamic   = 'Dynamic';
 $lang->block->modules['doc']->availableBlocks->mycollection = 'My Collection';
 $lang->block->modules['doc']->availableBlocks->recentupdate = 'Recently Update';
 $lang->block->modules['doc']->availableBlocks->viewlist     = 'Browse Leaderboard';
-$lang->block->modules['doc']->availableBlocks->productdoc   = $lang->productCommon . 'Document';
+if($config->vision == 'rnd') $lang->block->modules['doc']->availableBlocks->productdoc   = $lang->productCommon . 'Document';
 $lang->block->modules['doc']->availableBlocks->collectlist  = 'Favorite Leaderboard';
 $lang->block->modules['doc']->availableBlocks->projectdoc   = $lang->projectCommon . 'Document';
 

module/block/lang/en.php

@@ -358,6 +358,8 @@ if($config->vision == 'rnd')
     $lang->block->default['doc']['6']['title'] = $lang->productCommon . ' Document';
     $lang->block->default['doc']['6']['block'] = 'productdoc';
     $lang->block->default['doc']['6']['grid']  = 8;
+
+    $lang->block->default['doc']['6']['params']['count'] = '20';
 }
 
 $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard';
@@ -368,6 +370,8 @@ $lang->block->default['doc']['8']['title'] = $lang->projectCommon . ' Document';
 $lang->block->default['doc']['8']['block'] = 'projectdoc';
 $lang->block->default['doc']['8']['grid']  = 8;
 
+$lang->block->default['doc']['8']['params']['count'] = '20';
+
 $lang->block->count   = 'Count';
 $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Order by';
@@ -458,7 +462,7 @@ $lang->block->modules['doc']->availableBlocks->docdynamic      = 'Dynamic';
 $lang->block->modules['doc']->availableBlocks->docmycollection = 'My Collection';
 $lang->block->modules['doc']->availableBlocks->docrecentupdate = 'Recently Update';
 $lang->block->modules['doc']->availableBlocks->docviewlist     = 'Browse Leaderboard';
-$lang->block->modules['doc']->availableBlocks->productdoc      = $lang->productCommon . 'Document';
+if($config->vision == 'rnd')$lang->block->modules['doc']->availableBlocks->productdoc      = $lang->productCommon . 'Document';
 $lang->block->modules['doc']->availableBlocks->doccollectlist  = 'Favorite Leaderboard';
 $lang->block->modules['doc']->availableBlocks->projectdoc      = $lang->projectCommon . 'Document';
 

module/block/lang/fr.php

@@ -358,6 +358,8 @@ if($config->vision == 'rnd')
     $lang->block->default['doc']['6']['title'] = $lang->productCommon . ' Document';
     $lang->block->default['doc']['6']['block'] = 'productdoc';
     $lang->block->default['doc']['6']['grid']  = 8;
+
+    $lang->block->default['doc']['6']['params']['count'] = '20';
 }
 
 $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard';
@@ -368,6 +370,8 @@ $lang->block->default['doc']['8']['title'] = $lang->projectCommon . ' Document';
 $lang->block->default['doc']['8']['block'] = 'projectdoc';
 $lang->block->default['doc']['8']['grid']  = 8;
 
+$lang->block->default['doc']['8']['params']['count'] = '20';
+
 $lang->block->count   = 'Numéro';
 $lang->block->type    = 'Type';
 $lang->block->orderBy = 'Trié par';
@@ -458,7 +462,7 @@ $lang->block->modules['doc']->availableBlocks->docdynamic      = 'Dynamic';
 $lang->block->modules['doc']->availableBlocks->docmycollection = 'My Collection';
 $lang->block->modules['doc']->availableBlocks->docrecentupdate = 'Recently Update';
 $lang->block->modules['doc']->availableBlocks->docviewlist     = 'Browse Leaderboard';
-$lang->block->modules['doc']->availableBlocks->productdoc      = $lang->productCommon . 'Document';
+if($config->vision == 'rnd') $lang->block->modules['doc']->availableBlocks->productdoc      = $lang->productCommon . 'Document';
 $lang->block->modules['doc']->availableBlocks->doccollectlist  = 'Favorite Leaderboard';
 $lang->block->modules['doc']->availableBlocks->projectdoc      = $lang->projectCommon . 'Document';
 

module/block/lang/zh-cn.php

@@ -357,8 +357,9 @@ if($config->vision == 'rnd')
 {
     $lang->block->default['doc']['6']['title'] = $lang->productCommon . '文档';
     $lang->block->default['doc']['6']['block'] = 'productdoc';
-    $lang->block->default['doc']['6']['params']['count'] = '20';
     $lang->block->default['doc']['6']['grid']  = 8;
+
+    $lang->block->default['doc']['6']['params']['count'] = '20';
 }
 
 $lang->block->default['doc']['7']['title'] = '收藏排行榜';
@@ -367,9 +368,10 @@ $lang->block->default['doc']['7']['grid']  = 4;
 
 $lang->block->default['doc']['8']['title'] = $lang->projectCommon . '文档';
 $lang->block->default['doc']['8']['block'] = 'projectdoc';
-$lang->block->default['doc']['8']['params']['count'] = '20';
 $lang->block->default['doc']['8']['grid']  = 8;
 
+$lang->block->default['doc']['8']['params']['count'] = '20';
+
 $lang->block->count   = '数量';
 $lang->block->type    = '类型';
 $lang->block->orderBy = '排序';
@@ -460,7 +462,7 @@ $lang->block->modules['doc']->availableBlocks->docdynamic      = '文档动态';
 $lang->block->modules['doc']->availableBlocks->docmycollection = '我的收藏';
 $lang->block->modules['doc']->availableBlocks->docrecentupdate = '最近更新';
 $lang->block->modules['doc']->availableBlocks->docviewlist     = '浏览排行榜';
-$lang->block->modules['doc']->availableBlocks->productdoc      = $lang->productCommon . '文档';
+if($config->vision == 'rnd') $lang->block->modules['doc']->availableBlocks->productdoc      = $lang->productCommon . '文档';
 $lang->block->modules['doc']->availableBlocks->doccollectlist  = '收藏排行榜';
 $lang->block->modules['doc']->availableBlocks->projectdoc      = $lang->projectCommon . '文档';
 

module/doc/model.php

@@ -423,6 +423,7 @@ class docModel extends model
                 ->where('t1.deleted')->eq(0)
                 ->andWhere($query)
                 ->andWhere('t1.lib')->in($allLibIDList)
+                ->andWhere('t1.vision')->in($this->config->vision)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('t1.addedBy', 1)->eq($this->app->user->account)
                 ->orWhere('t1.id')->in(array_keys($docIDList))
@@ -440,6 +441,7 @@ class docModel extends model
                 ->andWhere('t1.id')->in($hasPrivDocIdList)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('t1.addedBy')->eq($this->app->user->account)
+                ->andWhere('t1.vision')->in($this->config->vision)
                 ->orderBy($sort)
                 ->page($pager)
                 ->fetchAll('id');
@@ -458,6 +460,7 @@ class docModel extends model
                 ->where('t1.deleted')->eq(0)
                 ->andWhere('t1.id')->in(array_keys($docIDList))
                 ->andWhere('t1.lib')->in($allLibIDList)
+                ->andWhere('t1.vision')->in($this->config->vision)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
                 ->orderBy($sort)
                 ->page($pager)
@@ -470,6 +473,7 @@ class docModel extends model
                 ->andWhere('id')->in($hasPrivDocIdList)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('lib')->in($allLibIDList)
+                ->andWhere('vision')->in($this->config->vision)
                 ->orderBy('editedDate_desc')
                 ->page($pager)
                 ->fetchAll('id');
@@ -483,6 +487,7 @@ class docModel extends model
                 ->andWhere('t1.id')->in($hasPrivDocIdList)
                 ->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
                 ->andWhere('t2.actor')->eq($this->app->user->account)
+                ->andWhere('t1.vision')->in($this->config->vision)
                 ->orderBy($sort)
                 ->page($pager)
                 ->fetchAll('id');

module/doc/view/lefttree.html.php

@@ -255,6 +255,7 @@ $(function()
             'ppt': 'ppt',
             'excel': 'excel'
         };
+
         ele.tree(
         {
             data: treeData,
@@ -662,7 +663,8 @@ $(function()
     });
 
     /* Make modules tree sortable */
-    $('#fileTree').sortable(
+    var $treeDom = objectType == 'project' ? $('#projectTree, #executionTree') :$('#fileTree');
+    $treeDom.sortable(
     {
         trigger: 'a.sort-module',
         dropToClass: 'sort-to',

module/repo/control.php

@@ -1391,6 +1391,7 @@ class repo extends control
      */
     public function import($server = 0)
     {
+        if($this->viewType !== 'json') $this->commonAction();
         if($_POST)
         {
             $this->repo->batchCreate();