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

framework/base/router.class.php

@@ -2561,7 +2561,10 @@ class super
         }
         elseif($this->scope == 'session')
         {
+            $openApp = $this->openApp;
+            if(!empty($openApp) and isset($_SESSION['app-' . $openApp][$key])) return $_SESSION['app-' . $openApp][$key];
             if(isset($_SESSION[$key])) return $_SESSION[$key];
+
             return false;
         }
         elseif($this->scope == 'env')

module/execution/control.php

@@ -1511,8 +1511,6 @@ class execution extends control
         $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendRdUsers, $this->config->maxCount);
         if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink;
 
-        $project = $this->project->getById($this->session->PRJ);
-
         $this->view->title           = $this->lang->execution->batchEdit;
         $this->view->position[]      = $this->lang->execution->batchEdit;
         $this->view->executionIDList = $executionIDList;
@@ -1521,7 +1519,6 @@ class execution extends control
         $this->view->poUsers         = $poUsers;
         $this->view->qdUsers         = $qdUsers;
         $this->view->rdUsers         = $rdUsers;
-        $this->view->isStage         = $project->model == 'waterfall' ? true : false;
         $this->display();
     }
 

module/execution/view/batchedit.html.php

@@ -76,7 +76,7 @@
             <td class='text-left<?php echo zget($visibleFields, 'RD', ' hidden')?>' style='overflow:visible'><?php echo html::select("RDs[$executionID]", $rdUsers, $executions[$executionID]->RD, "class='form-control chosen'");?></td>
             <td class='<?php echo zget($visibleFields, 'type',   'hidden')?>'>
               <?php
-              if($isStage)
+              if($executions[$executionID]->type == 'stage')
               {
                   echo html::select("attributes[$executionID]",    $lang->stage->typeList,   $executions[$executionID]->attribute,   'class=form-control');
               }