From 23ceba780d562c84fbda5cc8c605273b21c596e3 Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Fri, 16 Apr 2021 10:16:26 +0800
Subject: [PATCH]  * fix bug #12139.

---
 module/execution/control.php    | 5 +++--
 module/my/view/todo.html.php    | 2 +-
 module/productplan/js/browse.js | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 18035f81f4..2e1da26665 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1207,8 +1207,9 @@ class execution extends control
         }
         elseif($this->app->openApp == 'execution')
         {
-            if($this->config->systemMode == 'new') $executionID = key($this->executions);
-            $this->execution->setMenu($executionID);
+            $selectedExecutionID = $executionID;
+            if($this->config->systemMode == 'new') $selectedExecutionID = key($this->executions);
+            $this->execution->setMenu($selectedExecutionID);
         }
 
         $this->app->loadLang('program');
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 0e1f962354..41e9bed50b 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -96,7 +96,7 @@
             <?php echo $todo->id?>
           </td>
           <td class="c-date"><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
-          <td class="c-type"><?php echo $lang->todo->typeList[$todo->type];?></td>
+          <td class="c-type"><?php echo zget($lang->todo->typeList, $todo->type, '');?></td>
           <td class="c-pri"><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
           <td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
           <td><?php echo zget($users, $todo->assignedBy);?></td>
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index 1af1375ebd..d8851258c0 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -24,7 +24,7 @@ $(function()
     {
         var projectID = $('#project').val();
         var planID    = $('#planID').val();
-        parent.location.href = createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID);
+        $.apps.open(createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID), 'project')
     });
 });
 $(document).on('click', 'td.content .more', function(e)