From e9ef1765566097a46b9529886755d32e9caab132 Mon Sep 17 00:00:00 2001
From: holan20180123 <liyuchun@easycorp.ltd>
Date: Tue, 3 Aug 2021 10:16:08 +0800
Subject: [PATCH 1/5]  * Fix doc lib menu error.

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

diff --git a/module/doc/model.php b/module/doc/model.php
index 49262ebd6d..755d7a0594 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1983,7 +1983,7 @@ class docModel extends model
   <div class='btn-group'>
     <button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$objects[$objectID]}'>
     <span class='text'>{$objects[$objectID]}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list load-indicator' data-ride='searchList'>
-    <div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input"/><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+    <div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input"/><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>
 <div class='list-group'><div class='table-row'><div class='table-col $class'><div class='list-group' style='max-height: $maxHeight'>
 EOT;
             if($type == 'project' and $this->app->openApp == 'doc')

From e56c5bafdc8c48f56ae9d9855e2ffeaab28358a7 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie@easycorp.ltd>
Date: Tue, 3 Aug 2021 10:21:34 +0800
Subject: [PATCH 2/5] * Finish task #40837.

---
 module/program/js/edit.js         | 4 ++--
 module/program/model.php          | 4 ++--
 module/program/view/edit.html.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/program/js/edit.js b/module/program/js/edit.js
index f3aebd98a2..5b645446eb 100644
--- a/module/program/js/edit.js
+++ b/module/program/js/edit.js
@@ -51,7 +51,7 @@ $(function()
 
     $('#cancel').click(function()
     {
-        $('#isChangeUnit').val('false');
+        $('#syncPRJUnit').val('false');
         $('#exchangeRate').val('');
     })
 
@@ -69,7 +69,7 @@ $(function()
             return false;
         }
 
-        $('#isChangeUnit').val('true');
+        $('#syncPRJUnit').val('true');
         $('#exchangeRate').val(exchangeRate);
         $('#changeUnitTip').modal('hide');
     })
diff --git a/module/program/model.php b/module/program/model.php
index 2a60153a1f..aaf5e33d78 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -392,7 +392,7 @@ class programModel extends model
             ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2))
             ->join('whitelist', ',')
             ->stripTags($this->config->program->editor->edit['id'], $this->config->allowedTags)
-            ->remove('uid,delta,future,isChangeUnit,exchangeRate')
+            ->remove('uid,delta,future,syncPRJUnit,exchangeRate')
             ->get();
 
         $program  = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->edit['id'], $this->post->uid);
@@ -448,7 +448,7 @@ class programModel extends model
         if(!dao::isError())
         {
             /* If the program changes, the budget unit will be updated to the project and sub-programs simultaneously. */
-            if($program->budgetUnit != $oldProgram->budgetUnit and $_POST['isChangeUnit'] == 'true')
+            if($program->budgetUnit != $oldProgram->budgetUnit and $_POST['syncPRJUnit'] == 'true')
             {
                 $this->dao->update(TABLE_PROJECT)
                     ->set('budgetUnit')->eq($program->budgetUnit)
diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php
index 04e8e7af12..618b4c0a0c 100644
--- a/module/program/view/edit.html.php
+++ b/module/program/view/edit.html.php
@@ -55,7 +55,7 @@
               <?php else:?>
               <span class='input-group-addon'></span>
               <?php echo html::select('budgetUnit', $budgetUnitList, $program->budgetUnit, "class='form-control'");?>
-              <?php echo html::hidden('isChangeUnit', 'false');?>
+              <?php echo html::hidden('syncPRJUnit', 'false');?>
               <?php echo html::hidden('exchangeRate', '');?>
               <?php endif;?>
             </div>

From c16b0d4ffae32f6e66f50e924b29e951af5dd0e3 Mon Sep 17 00:00:00 2001
From: qiyu-xie <xieqiyu@easycorp.ltd>
Date: Tue, 3 Aug 2021 10:32:00 +0800
Subject: [PATCH 3/5] * Finish task#40841.

---
 module/program/view/browsebylist.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index d09aba1970..26ccc85a48 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -194,7 +194,7 @@ $(function()
 
     $('#programForm').on('tableNestStateChanged', function()
     {
-        /* Ensure visible progress pie inited after toggle nest states */
+        /* Ensure visible progress pie inited after toggle nest states. */
         $('.progress-pie:visible').progressPie();
     });
 });

From 2269148b1f01336ecbe75645a6a62be26a923615 Mon Sep 17 00:00:00 2001
From: holan20180123 <liyuchun@easycorp.ltd>
Date: Tue, 3 Aug 2021 10:37:04 +0800
Subject: [PATCH 4/5]  * Fix issue #336.

---
 module/doc/js/objectlibs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/doc/js/objectlibs.js b/module/doc/js/objectlibs.js
index 6f159aaca2..31158ee28e 100644
--- a/module/doc/js/objectlibs.js
+++ b/module/doc/js/objectlibs.js
@@ -54,7 +54,7 @@ function fullScreen()
             $('#content').addClass('scrollbar-hover');
             $('#content .actions').addClass('hidden');
             $('#content .file-image .right-icon').addClass('hidden');
-            $('#content .files-list .right-icon').addClass('hidden');
+            $('#content .detail').eq(1).addClass('hidden');
             $.cookie('isFullScreen', 1);
         };
         var whenFailEnterFullscreen = function(error)
@@ -92,7 +92,7 @@ function exitFullScreen()
     $('#content').removeClass('scrollbar-hover');
     $('#content .actions').removeClass('hidden');
     $('#content .file-image .right-icon').removeClass('hidden');
-    $('#content .files-list .right-icon').removeClass('hidden');
+    $('#content .detail').eq(1).removeClass('hidden');
     $.cookie('isFullScreen', 0);
 }
 

From 2e0d20f7b9c7c24fde5461a30279845afd0ca71a Mon Sep 17 00:00:00 2001
From: holan20180123 <liyuchun@easycorp.ltd>
Date: Tue, 3 Aug 2021 10:42:10 +0800
Subject: [PATCH 5/5]  * Finish task #40814.

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

diff --git a/module/doc/model.php b/module/doc/model.php
index 755d7a0594..28c35075f3 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1010,7 +1010,7 @@ class docModel extends model
                 }
                 $libs[$docLib->id] = $docLib->name;
 
-                $i++;
+                $i ++;
             }
         }
 
@@ -2175,11 +2175,11 @@ EOT;
         {
             if(!isset($extensionCount[$file->extension])) $extensionCount[$file->extension] = 0;
 
-            $filesCount++;
+            $filesCount ++;
 
             $sizeCount += $file->size;
 
-            $extensionCount[$file->extension]++;
+            $extensionCount[$file->extension] ++;
         }
 
         /* Unit conversion. */
@@ -2187,7 +2187,7 @@ EOT;
         while($sizeCount > 1024)
         {
             $sizeCount = $sizeCount / 1024;
-            $i++;
+            $i ++;
         }
         $unitList  = array('B', 'K', 'M', 'G');
         $sizeCount = round($sizeCount, 1) . $unitList[$i];