From 748335e401cf54a808de6df288faadfcf0609d2c Mon Sep 17 00:00:00 2001
From: wangyuting <851424971@qq.com>
Date: Tue, 22 Nov 2022 02:13:02 +0000
Subject: [PATCH] * Finish task #77136.

---
 module/admin/js/setmodule.js         | 10 ++++++-
 module/admin/view/setmodule.html.php | 40 +++++++++++++---------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/module/admin/js/setmodule.js b/module/admin/js/setmodule.js
index 32048ea3a0..ad652ec11e 100644
--- a/module/admin/js/setmodule.js
+++ b/module/admin/js/setmodule.js
@@ -11,5 +11,13 @@ $(function()
         {
             $("input[name='" + name + "'][type=hidden]").val('0').attr('disabled', false);
         }
-    })
+    });
+    $('input[name=allChecker]').change(function()
+    {
+        $(this).closest('tr').find("input[name^='module']").prop('checked', $(this).prop('checked')).change();
+    });
+    $('#allChecker').change(function()
+    {
+        $('input[name=allChecker]').prop('checked', $(this).prop('checked')).change();
+    });
 })
diff --git a/module/admin/view/setmodule.html.php b/module/admin/view/setmodule.html.php
index 73a90383e6..ef957bbde8 100644
--- a/module/admin/view/setmodule.html.php
+++ b/module/admin/view/setmodule.html.php
@@ -20,12 +20,8 @@
       <table class='table table-condensed table-bordered active-disabled table-fixed'>
         <thead class='text-center'>
           <tr>
-            <th rowspan='2' class='w-120px'><?php echo $lang->admin->setModule->module;?></th>
-            <th colspan='2'><?php echo $lang->admin->setModule->optional;?></th>
-          </tr>
-          <tr>
-            <th><?php echo $lang->admin->setModule->opened;?></th>
-            <th><?php echo $lang->admin->setModule->closed;?></th>
+            <th class='w-200px'><?php echo $lang->admin->setModule->module;?></th>
+            <th><?php echo $lang->admin->setModule->optional;?></th>
           </tr>
         </thead>
         <tbody>
@@ -41,26 +37,20 @@
 
           <?php if($hasData):?>
           <tr>
-            <td class='text-right'><?php echo $lang->admin->setModule->{$group};?></td>
+            <td class='text-middle text-right thWidth'>
+              <div class="checkbox-primary checkbox-inline checkbox-right check-all">
+                <input type='checkbox' id='allChecker<?php echo $group;?>' name='allChecker'>
+                <label class='text-right' for='allChecker<?php echo $group;?>'><?php echo $lang->admin->setModule->{$group};?></label>
+              </div>
+            </td>
             <td>
               <?php foreach($features as $feature):?>
               <?php $code = $group. ucfirst($feature);?>
               <?php if(strpos(",$disabledFeatures,", ",$code,") !== false) continue;?>
-              <?php if(strpos(",$closedFeatures,",   ",$code,") !== false) continue;?>
+              <?php $value = strpos(",$closedFeatures,", ",$code,") === false ? '1' : '0';?>
               <div class='group-item'>
-              <?php echo html::checkbox("module[{$code}]", array('1' => $lang->admin->setModule->{$feature}), '1', "data-code='{$code}'", 'inline');?>
-              <?php echo html::hidden("module[{$code}][]", '1', 'disabled');?>
-              </div>
-              <?php endForeach;?>
-            </td>
-            <td>
-              <?php foreach($features as $feature):?>
-              <?php $code = $group . ucfirst($feature);?>
-              <?php if(strpos(",$disabledFeatures,", ",$code,") !== false) continue;?>
-              <?php if(strpos(",$closedFeatures,",   ",$code,") === false) continue;?>
-              <div class='group-item'>
-              <?php echo html::checkbox("module[{$code}]", array('1' => $lang->admin->setModule->{$feature}), '0', "data-code='{$code}'", 'inline');?>
-              <?php echo html::hidden("module[{$code}][]", '0');?>
+              <?php echo html::checkbox("module[{$code}]", array('1' => $lang->admin->setModule->{$feature}), $value, "data-code='{$code}'", 'inline');?>
+              <?php echo html::hidden("module[{$code}][]", $value, $value ? 'disabled' : '');?>
               </div>
               <?php endForeach;?>
             </td>
@@ -68,7 +58,13 @@
           <?php endif;?>
           <?php endForeach;?>
           <tr>
-            <td colspan='3' class='text-center'><?php echo html::submitButton();?></td>
+            <td class='text-middle text-right thWidth'>
+              <div class="checkbox-primary checkbox-inline checkbox-right check-all">
+                <input type='checkbox' id='allChecker'>
+                <label class='text-right' for='allChecker'><?php echo $lang->selectAll;?></label>
+              </div>
+            </td>
+            <td><?php echo html::submitButton();?></td>
           </tr>
         </tbody>
       </table>