Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite

extension/lite/project/ext/lang/zh-cn/lite.php

@@ -1,2 +1,4 @@
 <?php
 $lang->project->leftStories = '剩余目标';
+
+$lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员可访问)";

extension/lite/project/ext/view/batchedit.lite.html.hook.php

@@ -0,0 +1,4 @@
+<script>
+$('#batchEditForm table thead tr th.c-parent').hide();
+$('#batchEditForm table tbody tr td [name^="parents"]').closest('td').hide();
+</script>

extension/lite/tree/ext/lang/zh-cn/lite.php

@@ -12,3 +12,4 @@ if($app->rawModule == 'tree' and $app->rawMethod == 'browse')
     $lang->tree->name             = '目录名称';
     $lang->tree->syncFromProduct  = '复制目录';
 }
+if($app->rawModule == 'story') $lang->tree->manage = $lang->tree->manageMenu;

module/company/config.php

@@ -8,7 +8,9 @@ $app->loadLang('action');
 $app->loadLang('user');
 $config->company->dynamic = new stdclass();
 $config->company->dynamic->search['module']               = 'action';
-$config->company->dynamic->search['fields']['product']    = $lang->action->product;
+
+if($config->vision == 'rnd') $config->company->dynamic->search['fields']['product']    = $lang->action->product;
+
 $config->company->dynamic->search['fields']['project']    = '项目';
 $config->company->dynamic->search['fields']['execution']  = $lang->action->execution;
 $config->company->dynamic->search['fields']['actor']      = $lang->action->actor;
@@ -17,7 +19,8 @@ $config->company->dynamic->search['fields']['objectType'] = $lang->action->objec
 $config->company->dynamic->search['fields']['date']       = $lang->action->date;
 $config->company->dynamic->search['fields']['action']     = $lang->action->action;
 
-$config->company->dynamic->search['params']['product']    = array('operator' => '=',  'control' => 'select', 'values' => '');
+if($config->vision == 'rnd') $config->company->dynamic->search['params']['product']    = array('operator' => '=',  'control' => 'select', 'values' => '');
+
 $config->company->dynamic->search['params']['project']    = array('operator' => '=',  'control' => 'select', 'values' => '');
 $config->company->dynamic->search['params']['execution']  = array('operator' => '=',  'control' => 'select', 'values' => '');
 $config->company->dynamic->search['params']['actor']      = array('operator' => '=',  'control' => 'select', 'values' => '');

module/company/control.php

@@ -271,7 +271,7 @@ class company extends control
         $this->config->company->dynamic->search['actionURL'] = $this->createLink('company', 'dynamic', "browseType=bysearch&param=myQueryID");
         $this->config->company->dynamic->search['queryID'] = $queryID;
         $this->config->company->dynamic->search['params']['action']['values']    = $this->lang->action->search->label;
-        $this->config->company->dynamic->search['params']['product']['values']   = $products;
+        if($this->config->vision == 'rnd') $this->config->company->dynamic->search['params']['product']['values']   = $products;
         $this->config->company->dynamic->search['params']['project']['values']   = $projects;
         $this->config->company->dynamic->search['params']['execution']['values'] = $executions;
         $this->config->company->dynamic->search['params']['actor']['values']     = $accountPairs;

module/company/view/dynamic.html.php

@@ -28,7 +28,9 @@
     ?>
     <?php endforeach;?>
     <div class="input-control space c-user"><?php echo html::select('account', $userIdPairs, $userID, 'class="form-control chosen" data-max_drop_width="215"');?></div>
+    <?php if($this->config->vision == 'rnd'):?>
     <div class="input-control space c-product"><?php echo html::select('product', $products, $productID, 'class="form-control chosen" data-max_drop_width="215"');?></div>
+    <?php endif;?>
     <?php if($config->systemMode == 'new'):?>
     <div class="input-control space c-project"><?php echo html::select('project', $projects, $projectID, 'class="form-control chosen" data-max_drop_width="215"');?></div>
     <?php endif;?>

module/product/model.php

@@ -253,6 +253,7 @@ class productModel extends model
             ->beginIF($programID)->andWhere('t1.program')->eq($programID)->fi()
             ->beginIF($line > 0)->andWhere('t1.line')->eq($line)->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->products)->fi()
+            ->andWhere('t1.vision')->eq($this->config->vision)->fi()
             ->beginIF($status == 'noclosed')->andWhere('t1.status')->ne('closed')->fi()
             ->beginIF($status != 'all' and $status != 'noclosed' and $status != 'involved')->andWhere('t1.status')->in($status)->fi()
             ->beginIF($status == 'involved')
@@ -285,7 +286,8 @@ class productModel extends model
             ->beginIF(strpos($mode, 'all') === false)->andWhere('deleted')->eq(0)->fi()
             ->beginIF($programID)->andWhere('program')->eq($programID)->fi()
             ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
+            ->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('id')->in($this->app->user->view->products)->fi()
+            ->andWhere('vision')->eq($this->config->vision)
             ->orderBy($orderBy)
             ->fetchPairs('id', 'name');
         return $products;
@@ -325,6 +327,7 @@ class productModel extends model
             ->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
             ->where('t3.deleted')->eq(0)
             ->beginIF(!$this->app->user->admin)->andWhere('t3.id')->in($this->app->user->view->products)->fi()
+            ->andWhere('t3.vision')->eq($this->config->vision)->fi()
             ->beginIF($model != 'all')->andWhere('t2.model')->eq($model)
             ->fetchPairs('id', 'name');
     }
@@ -353,7 +356,8 @@ class productModel extends model
             ->on('t1.product = t2.id')
             ->where('t2.deleted')->eq(0)
             ->beginIF(!empty($projectID))->andWhere('t1.project')->eq($projectID)->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->products)->fi()
+            ->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('t2.id')->in($this->app->user->view->products)->fi()
+            ->andWhere('t2.vision')->eq($this->config->vision)
             ->beginIF(strpos($status, 'noclosed') !== false)->andWhere('t2.status')->ne('closed')->fi()
             ->orderBy($orderBy . 't2.order asc')
             ->fetchAll('id');