From 0976ce4cd565d99e4dbe2727fd517847ea2cb3d5 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 22 Jul 2022 10:09:27 +0800
Subject: [PATCH 01/10] * Fix bug #25567.

---
 module/story/view/edit.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index d3bed5546f..ced03a5862 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -216,7 +216,8 @@
               </tr>
               <tr>
                 <th><?php echo $lang->story->assignedTo;?></th>
-                <td><?php echo html::select('assignedTo', $users, $story->assignedTo, 'class="form-control chosen"');?></td>
+                <?php $assignedToList = $story->status == 'closed' ? $users + array('closed' => 'Closed') : $users;?>
+                <td><?php echo html::select('assignedTo', $assignedToList, $story->assignedTo, 'class="form-control chosen"');?></td>
               </tr>
               <?php if($isShowReviewer):?>
               <tr>

From 5818db887ff8b2168a2d8b6d277c7ce6510b15fd Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 22 Jul 2022 10:28:42 +0800
Subject: [PATCH 02/10] * Fix bug #25122.

---
 module/task/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 6e4bbfd708..6f8d4795ac 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1823,7 +1823,7 @@ class taskModel extends model
 
         if(!empty($task->team))
         {
-            $myConsumed = $task->team[$task->assignedTo]->consumed;
+            $myConsumed = $task->team[$this->app->user->account]->consumed;
 
             $newTeamInfo = new stdClass();
             $newTeamInfo->consumed = $myConsumed + $consumed;
@@ -1831,7 +1831,7 @@ class taskModel extends model
             $this->dao->update(TABLE_TEAM)->data($newTeamInfo)
                 ->where('root')->eq($taskID)
                 ->andWhere('type')->eq('task')
-                ->andWhere('account')->eq($task->assignedTo)
+                ->andWhere('account')->eq($this->app->user->account)
                 ->exec();
 
             $data = $this->computeHours4Multiple($task, $data);

From ba22c27e28759c97c7a6497dd06c90115beb8971 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 10:35:37 +0800
Subject: [PATCH 03/10] * Fix bug #24181.

---
 module/bug/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index f7e54492da..1ef0d988ce 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -108,7 +108,7 @@ class bug extends control
 
         /* Set browse type. */
         $browseType = strtolower($browseType);
-        if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch or $browseType == 'bybranch')
+        if($this->cookie->preProductID != $productID or ($this->cookie->preBranch != $branch and $product->type != 'normal' and $branch != 'all') or $browseType == 'bybranch')
         {
             $_COOKIE['bugModule'] = 0;
             setcookie('bugModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);

From 374ec6f55d6541581cb98d76072f16c02fb123db Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 11:06:51 +0800
Subject: [PATCH 04/10] * Fix bug #25554.

---
 module/action/model.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 5e203ed3de..794cafde92 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1094,11 +1094,12 @@ class actionModel extends model
         {
             if(empty($this->app->user->rights['acls']['actions'])) return '';
 
+            $canViewPrograms = empty($this->app->user->view->programs) ? '0' : $this->app->user->view->programs;
             foreach($this->app->user->rights['acls']['actions'] as $moduleName => $actions)
             {
                 if(isset($this->lang->mainNav->$moduleName) and !empty($this->app->user->rights['acls']['views']) and !isset($this->app->user->rights['acls']['views'][$moduleName])) continue;
-                $canViewPrograms  = $moduleName == 'program' ? "`objectID` in ({$this->app->user->view->programs}) and " : '';
-                $actionCondition .= "($canViewPrograms `objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
+                $programQuery     = $moduleName == 'program' ? "`objectID` in ($canViewPrograms) and " : '';
+                $actionCondition .= "($programQuery `objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
             }
             $actionCondition = trim($actionCondition, 'or ');
         }

From c820d66059c920db30090aae60244bf484c146c6 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 22 Jul 2022 11:36:41 +0800
Subject: [PATCH 05/10]  * fix bug #25557.

---
 module/programplan/view/gantt.html.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php
index 86c3cfe0db..03992508db 100644
--- a/module/programplan/view/gantt.html.php
+++ b/module/programplan/view/gantt.html.php
@@ -15,10 +15,6 @@
 <style>
 #ganttView {height: 600px;}
 #mainContent:before {background: #fff;}
-.gantt-fullscreen #header,
-.gantt-fullscreen #mainMenu,
-.gantt-fullscreen #footer {display: none!important;}
-.gantt-fullscreen #mainContent {position: fixed; top: 0; right: 0; bottom: 0; left: 0}
 .checkbox-primary {margin-top: 0px; margin-left: 10px;}
 form {display: block; margin-top: 0em; margin-block-end: 1em;}
 .gantt_task_content span.task-label, .gantt_task_content span.label-pri{display: none;}
@@ -64,6 +60,11 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
 #mainContent.loading #ganttContainer {padding: 40px;}
 #mainContent.loading .scrollVer_cell,
 #mainContent.loading .scrollVer_cell {display: none;}
+#
+.gantt-fullscreen #header,
+.gantt-fullscreen #mainMenu,
+.gantt-fullscreen #footer {display: none!important;}
+.gantt-fullscreen #mainContent {position: fixed; top: 0; right: 0; bottom: 0; left: 0}
 </style>
 <?php js::set('customUrl', $this->createLink('programplan', 'ajaxCustom'));?>
 <?php js::set('dateDetails', $dateDetails);?>
@@ -90,7 +91,8 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
   <div id='ganttContainer'>
     <div class='gantt' id='ganttView'></div>
   </div>
-  <a id='ganttDownload' download='gantt-export-<?php echo $projectID;?>.png'></a>
+  <?php $fileName = "gantt-export-{$projectID}";?>
+  <a id='ganttDownload' target='hiddenwin' download='<?php echo "{$fileName}.png";?>'></a>
 </div>
 <script>
 var scriptLoadedMap   = {};
@@ -231,7 +233,7 @@ function drawGanttToCanvas(exportType, successCallback, errorCallback)
                             orientation: width > height ? 'l' : 'p'
                         });
                         pdf.addImage(canvas, 0, 0, pdf.internal.pageSize.getWidth(), pdf.internal.pageSize.getHeight());
-                        pdf.save('gantt-export-<?php echo $projectID;?>.pdf');
+                        pdf.save('<?php echo "$fileName.pdf"?>');
                         if(successCallback) successCallback(pdf);
                         afterFinish();
                     }, function(error)
@@ -248,7 +250,7 @@ function drawGanttToCanvas(exportType, successCallback, errorCallback)
                         var imageUrl = URL.createObjectURL(blob);
                         if(navigator.msSaveBlob)
                         {
-                            navigator.msSaveOrOpenBlob(blob, 'gantt-export-<?php echo $projectID;?>.png');
+                            navigator.msSaveOrOpenBlob(blob, '<?php echo $fileName; ?>.png');
                         }
                         else
                         {

From 29a889ddcffe37ca8a49291bbd2c45cd4fcafbf0 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 22 Jul 2022 12:03:23 +0800
Subject: [PATCH 06/10] * Fix bug #24702.

---
 module/testcase/js/common.js              | 10 +++++-----
 module/testcase/view/batchcreate.html.php |  6 +++---
 module/testcase/view/batchedit.html.php   |  2 +-
 module/testcase/view/create.html.php      |  2 +-
 module/testcase/view/edit.html.php        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js
index b9f686ff18..f08c4ac4d7 100644
--- a/module/testcase/js/common.js
+++ b/module/testcase/js/common.js
@@ -131,7 +131,7 @@ function setStories()
     productID = $('#product').val();
     branch    = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
-    link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=0&onlyOption=false&status=noclosed&limit=50&type=full&hasParent=1&executionID=' + executionID);
+    link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=0&onlyOption=false&status=noclosed&limit=0&type=full&hasParent=1&executionID=' + executionID);
 
     $.get(link, function(stories)
     {
@@ -141,7 +141,7 @@ function setStories()
         $('#story').val(value);
         $('#story_chosen').remove();
         $('#story').next('.picker').remove();
-        $("#story").chosen();
+        $("#story").picker();
     });
 }
 
@@ -364,7 +364,7 @@ function loadStories(productID, moduleID, num)
 {
     var branchIDName = (config.currentMethod == 'batchcreate' || config.currentMethod == 'showimport') ? '#branch' : '#branches';
     var branchID     = $(branchIDName + num).val();
-    var storyLink    = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branchID + '&moduleID=' + moduleID + '&storyID=0&onlyOption=false&status=noclosed&limit=50&type=full&hasParent=1&executionID=0&number=' + num);
+    var storyLink    = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branchID + '&moduleID=' + moduleID + '&storyID=0&onlyOption=false&status=noclosed&limit=0&type=full&hasParent=1&executionID=0&number=' + num);
     $.get(storyLink, function(stories)
     {
         if(!stories) stories = '<select id="story' + num + '" name="story[' + num + ']" class="form-control"></select>';
@@ -378,7 +378,7 @@ function loadStories(productID, moduleID, num)
                 $('#story' + i + "_chosen").remove();
                 $('#story' + i).next('.picker').remove();
                 $('#story' + i).attr('name', 'story[' + i + ']');
-                $('#story' + i).chosen();
+                $('#story' + i).picker();
             }
         }
         else
@@ -387,7 +387,7 @@ function loadStories(productID, moduleID, num)
             $('#story' + num + "_chosen").remove();
             $('#story' + num).next('.picker').remove();
             $('#story' + num).attr('name', 'story[' + num + ']');
-            $('#story' + num).chosen();
+            $('#story' + num).picker();
         }
     });
 }
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index 86afac21b6..ac496f4a04 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -90,7 +90,7 @@
             <td class="text-center"><?php echo $i;?></td>
             <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?> branchBox'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control' onchange='setModules(this.value, $productID, $i)'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?> moduleBox' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen' onchange='loadStories($productID, this.value, $i)' data-drop_direction='down'");?></td>
-            <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?> storyBox' style='overflow:visible'> <?php echo html::select("story[$i]", $storyPairs, $story ? $story->id : '', 'class="form-control chosen"');?></td>
+            <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?> storyBox' style='overflow:visible'> <?php echo html::select("story[$i]", $storyPairs, $story ? $story->id : '', 'class="form-control picker-select"');?></td>
             <td style='overflow:visible'>
               <div class="input-control has-icon-right">
                 <?php echo html::input("title[$i]", '', "class='form-control title-import'");?>
@@ -141,7 +141,7 @@
       <td class="text-center">%s</td>
       <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?> branchBox'><?php echo html::select("branch[%s]", $branches, $branch, "class='form-control chosen' onchange='setModules(this.value, $productID, \"%s\")'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?> moduleBox' style='overflow:visible'><?php echo html::select("module[%s]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen' onchange='loadStories($productID, this.value, \"%s\")' data-drop_direction='down'");?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?> storyBox' style='overflow:visible'> <?php echo html::select("story[%s]", $storyPairs, '', 'class="form-control chosen"');?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?> storyBox' style='overflow:visible'> <?php echo html::select("story[%s]", $storyPairs, '', 'class="form-control picker-select"');?></td>
       <td style='overflow:visible'>
         <div class="input-control has-icon-right">
           <?php echo html::input("title[%s]", '', "class='form-control title-import'");?>
@@ -180,7 +180,7 @@
       <td class="text-center"><?php echo $i;?></td>
       <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?> branchBox'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control' onchange='setModules(this.value, $productID, $i)'");?></td>
       <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?> moduleBox' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen' onchange='loadStories($productID, this.value, $i)' data-drop_direction='down'");?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?> storyBox' style='overflow:visible'> <?php echo html::select("story[$i]", $storyPairs, $story ? $story->id : '', 'class="form-control chosen"');?></td>
+      <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?> storyBox' style='overflow:visible'> <?php echo html::select("story[$i]", $storyPairs, $story ? $story->id : '', 'class="form-control picker-select"');?></td>
       <td style='overflow:visible'>
         <div class="input-control has-icon-right">
           <?php echo html::input("title[$i]", '', "class='form-control title-import'");?>
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index a3a38b0cf0..5549ccc491 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -97,7 +97,7 @@
             </td>
             <?php endif;?>
             <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]", zget($modulePairs, $caseID, array(0 => '/')), $cases[$caseID]->module, "class='form-control chosen' onchange='loadStories($productID, this.value, $caseID)'");?></td>
-            <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden')?>' style='overflow:visible'><?php echo html::select("story[$caseID]", $stories, $cases[$caseID]->story, "class='form-control chosen'");?></td>
+            <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden')?>' style='overflow:visible'><?php echo html::select("story[$caseID]", $stories, $cases[$caseID]->story, "class='form-control picker-select'");?></td>
             <td style='overflow:visible' title='<?php echo $cases[$caseID]->title?>'>
               <div class='input-group'>
                 <div class="input-control has-icon-right">
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 4bfecdb21c..e9a6f9a188 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -84,7 +84,7 @@ foreach(explode(',', $config->testcase->create->requiredFields) as $field)
             <th><?php echo $lang->testcase->lblStory;?></th>
             <td colspan='2'>
               <div class='input-group' id='storyIdBox'>
-                <?php echo html::select('story', $stories, $storyID, 'class="form-control chosen" onchange="setPreview();" data-no_results_text="' . $lang->searchMore . '"');?>
+                <?php echo html::select('story', $stories, $storyID, 'class="form-control picker-select" onchange="setPreview();" data-no_results_text="' . $lang->searchMore . '"');?>
                 <span class='input-group-btn' style='width: 0.01%'>
                 <?php if($storyID == 0): ?>
                   <a href='' id='preview' class='btn hidden'><?php echo $lang->preview;?></a>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 449d189d30..07d9a0a0d6 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -204,7 +204,7 @@
               <?php if(!$isLibCase):?>
               <tr>
                 <th><?php echo $lang->testcase->story;?></th>
-                <td class='text-left'><div id='storyIdBox'><?php echo html::select('story', $stories, $case->story, 'class="form-control chosen"');?></div>
+                <td class='text-left'><div id='storyIdBox'><?php echo html::select('story', $stories, $case->story, 'class="form-control picker-select"');?></div>
                 </td>
               </tr>
               <?php endif;?>

From 22230645ddaf316fb9f833d5fa270b3aa1e653ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Fri, 22 Jul 2022 13:07:49 +0800
Subject: [PATCH 07/10] * Fix bug #25627.

---
 module/story/config.php  | 2 +-
 module/story/control.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/story/config.php b/module/story/config.php
index ef3c7299d5..5d79a91faf 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -32,7 +32,7 @@ $config->story->editor->assignto = array('id' => 'comment', 'tools' => 'simpleTo
 $config->story->list = new stdclass();
 $config->story->list->exportFields      = '
     id, product, branch, module, plan, source, sourceNote, title, spec, verify, keywords,
-    pri, estimate, status, stage, taskCountAB, bugCountAB, caseCountAB,
+    pri, estimate, status, stage, category, taskCountAB, bugCountAB, caseCountAB,
     openedBy, openedDate, assignedTo, assignedDate, mailto,
     reviewedBy, reviewedDate,
     closedBy, closedDate, closedReason,
diff --git a/module/story/control.php b/module/story/control.php
index 2168c87aca..8252aaace1 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2597,7 +2597,7 @@ class story extends control
                 if(isset($storyLang->stageList[$story->stage]))         $story->stage        = $storyLang->stageList[$story->stage];
                 if(isset($storyLang->reasonList[$story->closedReason])) $story->closedReason = $storyLang->reasonList[$story->closedReason];
                 if(isset($storyLang->sourceList[$story->source]))       $story->source       = $storyLang->sourceList[$story->source];
-                if(isset($storyLang->sourceList[$story->sourceNote]))   $story->sourceNote   = $storyLang->sourceList[$story->sourceNote];
+                if(isset($storyLang->categoryList[$story->category]))   $story->category     = $storyLang->categoryList[$story->category];
 
                 if(isset($users[$story->openedBy]))     $story->openedBy     = $users[$story->openedBy];
                 if(isset($users[$story->assignedTo]))   $story->assignedTo   = $users[$story->assignedTo] . "(#$story->assignedTo)";

From d83ed1092d4c8266723a0c4431047fb246e6a36e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 22 Jul 2022 13:17:18 +0800
Subject: [PATCH 08/10] * Fix bug #25554.

---
 module/action/model.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 794cafde92..510c61c9a2 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1044,6 +1044,8 @@ class actionModel extends model
             if($this->app->getMethodName() == 'dynamic') $beginDate = $year - 1 . '-01-01';
         }
 
+        $programCondition = empty($this->app->user->view->programs) ? '0' : $this->app->user->view->programs;
+
         /* Get actions. */
         $actions = $this->dao->select('*')->from(TABLE_ACTION)
             ->where('objectType')->notIN('kanbanregion,kanbanlane,kanbancolumn')
@@ -1070,6 +1072,7 @@ class actionModel extends model
             ->beginIF($actionCondition)->andWhere("($actionCondition)")->fi()
             /* Filter out client login/logout actions. */
             ->andWhere('action')->notin('disconnectxuanxuan,reconnectxuanxuan,loginxuanxuan,logoutxuanxuan')
+            ->andWhere("IF((objectType = 'program'), (objectID in ($programCondition)), '1=1')")
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll();
@@ -1094,12 +1097,10 @@ class actionModel extends model
         {
             if(empty($this->app->user->rights['acls']['actions'])) return '';
 
-            $canViewPrograms = empty($this->app->user->view->programs) ? '0' : $this->app->user->view->programs;
             foreach($this->app->user->rights['acls']['actions'] as $moduleName => $actions)
             {
                 if(isset($this->lang->mainNav->$moduleName) and !empty($this->app->user->rights['acls']['views']) and !isset($this->app->user->rights['acls']['views'][$moduleName])) continue;
-                $programQuery     = $moduleName == 'program' ? "`objectID` in ($canViewPrograms) and " : '';
-                $actionCondition .= "($programQuery `objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
+                $actionCondition .= "(`objectType` = '$moduleName' and `action` " . helper::dbIN($actions) . ") or ";
             }
             $actionCondition = trim($actionCondition, 'or ');
         }

From 69049288982c05b7a660495a38bef364ae473e73 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 22 Jul 2022 13:25:09 +0800
Subject: [PATCH 09/10] * Fix bug #25389.

---
 module/upgrade/model.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index fd58531ebe..f0868da70f 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -5038,7 +5038,7 @@ class upgradeModel extends model
     public function computeObjectMembers()
     {
         $this->app->loadLang('user');
-        $projects      = $this->dao->select('id,days')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchAll('id');
+        $projects      = $this->dao->select('id,days,PM')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchAll('id');
         $projectIdList = array_keys($projects);
 
         /* Get product and sprint team. */
@@ -5091,7 +5091,9 @@ class upgradeModel extends model
 
             $projectMember = array_filter($projectMember);
             $project       = zget($projects, $projectID, '');
-            $members       = implode(',', $projectMember);
+
+            if(!empty($project) and !isset($projectMember[$project->PM])) $projectMember[$project->PM] = $project->PM;
+            $members = implode(',', $projectMember);
 
             $this->dao->update(TABLE_DOCLIB)
                 ->set('users')->eq($members)

From 3db92860742124c578e668e2f5daa7afbf9a59a5 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 22 Jul 2022 13:28:02 +0800
Subject: [PATCH 10/10] * Fix bug #25398.

---
 module/user/css/login.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/user/css/login.css b/module/user/css/login.css
index f983807e03..d6ece8764a 100644
--- a/module/user/css/login.css
+++ b/module/user/css/login.css
@@ -24,3 +24,4 @@ html[lang='en'] #loginPanel .table-form > tbody > tr > th {width: 80px;}
 .table-row-extension .alert {margin-bottom: 0px !important;}
 .table-row-extension .content {color: #3c4353;}
 .table-row-extension .expired-tips {cursor: pointer;}
+[lang^=fr] #loginPanel .table-form > tbody > tr > th {width: 100px;}