Merge branch 'zentaopms261_wyd' into 'master'

Zentaopms261 wyd

See merge request easycorp/zentaopms!6178

module/kanban/js/view.js

@@ -483,7 +483,7 @@ function renderExecutionItem(item, $item)
     var name   = item.title ? item.title : item.name;
     if(!$title.length)
     {
-        var icon = mode == 'new' ? 'run' : 'project';
+        var icon = mode == 'ALM' ? 'run' : 'project';
         var viewMethod = item.execType == 'kanban' ? 'kanban' : 'view';
         if(privs.includes('viewExecution') && item.deleted == '0') $title = $('<a class="title"><i class="icon icon-' + icon + '"></i>' + name + '</a>').appendTo($titleBox).attr('href', createLink('execution', viewMethod, 'executionID=' + item.fromID));
         if(!privs.includes('viewExecution') || item.deleted == '1') $title = $('<div class="title"><i class="icon icon-' + icon + '"></i>' + name + '</div>').appendTo($titleBox);

module/kanban/view/view.html.php

@@ -36,6 +36,7 @@ js::set('kanbanID', $kanban->id);
 js::set('laneCount', $laneCount);
 js::set('userList', $userList);
 js::set('noAssigned', $lang->kanbancard->noAssigned);
+js::set('mode', $config->systemMode);
 js::set('users', $users);
 js::set('colorListLang', $lang->kanbancard->colorList);
 js::set('colorList', $this->config->kanban->cardColorList);

module/my/model.php

@@ -1058,6 +1058,7 @@ class myModel extends model
             ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
             ->andWhere('t2.reviewer')->eq($this->app->user->account)
             ->andWhere('t2.result')->eq('')
+            ->andWhere('t1.vision')->eq($this->config->vision)
             ->andWhere('t1.status')->eq('reviewing')
             ->orderBy($orderBy)
             ->query();
@@ -1263,6 +1264,7 @@ class myModel extends model
         $actions = $this->dao->select('objectType,objectID,actor,action,MAX(`date`) as `date`,extra')->from(TABLE_ACTION)
             ->where('actor')->eq($this->app->user->account)
             ->andWhere('objectType')->in($this->config->my->reviewObjectType)
+            ->andWhere('vision')->eq($this->config->vision)
             ->andWhere($condition)
             ->groupBy('objectType,objectID')
             ->orderBy($orderBy)