Merge branch 'master' of https://github.com/easysoft/zentaopms

module/group/js/manageview.js

@@ -8,6 +8,18 @@ function toggleProject()
     $('#projectBox').toggle($('#project').prop("checked"));
 }
 
+function selectAll(obj)
+{
+    if($(obj).prop('checked'))
+    {
+        $(obj).closest('td').find(':checkbox').attr('checked', 'checked');
+    }
+    else
+    {
+        $(obj).closest('td').find(':checkbox').removeAttr('checked');
+    }
+}
+
 $('input:checkbox[name^="allchecker"]').change(function()
 {
     setTimeout(function(){toggleProduct(),toggleProject()}, 50);

module/group/view/manageview.html.php

@@ -41,7 +41,7 @@
         <?php endforeach;?>
           <div class='group-item'>
             <div class='checkbox-primary'>
-              <input type="checkbox" id='allchecker' name="allchecker" onclick="selectAll(this, '', 'checkbox')" <?php if(empty($group->acl['views'])) echo "checked";?> />
+              <input type="checkbox" id='allchecker' name="allchecker" onclick="selectAll(this)" <?php if(empty($group->acl['views'])) echo "checked";?> />
               <label class='priv' for='allchecker'>
                 <?php echo $lang->selectAll?>
               </label>

module/tree/lang/zh-tw.php

@@ -37,7 +37,7 @@ $lang->tree->dragAndSort        = "拖放排序";
 $lang->tree->sort               = "排序";
 $lang->tree->addChild           = "增加子模組";
 $lang->tree->confirmDelete      = '該模組及其子模組都會被刪除，您確定刪除嗎？';
-$lang->tree->confirmDeleteLine  = '該產品綫及其子產品綫都會被刪除，您確定刪除嗎？';
+$lang->tree->confirmDeleteLine  = '您確定刪除該產品綫嗎？';
 $lang->tree->confirmRoot        = "模組的所屬{$lang->productCommon}修改，會關聯修改該模組下的需求、Bug、用例的所屬{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的關聯關係。該操作比較危險，請謹慎操作。是否確認修改？";
 $lang->tree->successSave        = '成功保存';
 $lang->tree->successFixed       = '成功修正數據！';