From 8a7a4379609d3b3a2f56f9d12c1b0273c820c683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 18 Dec 2017 11:00:29 +0800
Subject: [PATCH 1/3] * Task #3396 and Fix bug

---
 config/filter.php    | 5 +++++
 module/git/model.php | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/filter.php b/config/filter.php
index ee9d0880b3..66e2c6ce16 100644
--- a/config/filter.php
+++ b/config/filter.php
@@ -199,3 +199,8 @@ $filter->user->login->get['account']  = 'account';
 $filter->user->login->get['lang']     = 'reg::lang';
 $filter->user->login->get['password'] = 'reg::any';
 $filter->user->edit->get['from']      = 'reg::word';
+
+$filter->git->cat->get['repoUrl']  = 'reg::base64';
+$filter->git->diff->get['repoUrl'] = 'reg::base64';
+$filter->svn->cat->get['repoUrl']  = 'reg::base64';
+$filter->svn->diff->get['repoUrl'] = 'reg::base64';
\ No newline at end of file
diff --git a/module/git/model.php b/module/git/model.php
index 1932bc00b5..46b1d40502 100644
--- a/module/git/model.php
+++ b/module/git/model.php
@@ -759,9 +759,8 @@ class gitModel extends model
     public function buildURL($methodName, $url, $revision)
     {
         $buildedURL  = helper::createLink('git', $methodName, "path=&revision=$revision", 'html');
-        $buildedURL .= strpos($buildURL, '?') === false ? '?' : '&';
+        $buildedURL .= strpos($buildedURL, '?') === false ? '?' : '&';
         $buildedURL .= 'repoUrl=' . helper::safe64Encode($url);
-
         return $buildedURL;
     }
 }

From e6bcc3101c147d17b86031c0408477770a782c2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 18 Dec 2017 13:43:52 +0800
Subject: [PATCH 2/3] * Fix bug#1214

---
 module/productplan/js/create.js | 7 ++++++-
 module/project/js/create.js     | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/module/productplan/js/create.js b/module/productplan/js/create.js
index 99e9bae940..e58173c215 100644
--- a/module/productplan/js/create.js
+++ b/module/productplan/js/create.js
@@ -40,4 +40,9 @@ $('#begin').on('change', function()
 {
     $("#end").val('');
     $("input:radio[name='delta']").attr("checked",false);
-});
\ No newline at end of file
+});
+
+$('#end').on('change', function()
+{
+    $("input:radio[name='delta']").attr("checked", false);
+});
diff --git a/module/project/js/create.js b/module/project/js/create.js
index 4ecdecef3c..b4f739c7c4 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -19,6 +19,10 @@ $(function()
        $("#days").val('');
        $("input:radio[name='delta']").attr("checked",false);
     });
+    $('#end').on('change', function()
+    {
+        $("input:radio[name='delta']").attr("checked", false);
+    })
 });
 
 function showTypeTips()

From 507a436704b5383cf5461bf164f0b41c6d2792de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 18 Dec 2017 13:57:20 +0800
Subject: [PATCH 3/3] * Fix bug#1275

---
 module/doc/lang/en.php           | 1 +
 module/doc/lang/zh-cn.php        | 1 +
 module/tree/view/browse.html.php | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 6224beb469..3d17d4127c 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -64,6 +64,7 @@ $lang->doc->manageType     = 'Manage Category';
 $lang->doc->editType       = 'Edit';
 $lang->doc->deleteType     = 'Delete';
 $lang->doc->addType        = 'Add';
+$lang->doc->childType      = 'Child';
 
 $lang->doc->libName        = 'Name';
 $lang->doc->libType        = 'Category';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index ce1c8c99d3..7af011aef3 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -64,6 +64,7 @@ $lang->doc->manageType     = '维护分类';
 $lang->doc->editType       = '编辑分类';
 $lang->doc->deleteType     = '删除分类';
 $lang->doc->addType        = '增加分类';
+$lang->doc->childType      = '子分类';
 
 $lang->doc->libName        = '文档库名称';
 $lang->doc->libType        = '文档库类型';
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index ac0efd610e..64118b6abc 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -182,7 +182,7 @@ $(function()
             {
                 linkTemplate: '<?php echo helper::createLink('tree', 'browse', "rootID=$rootID&viewType=$viewType&moduleID={0}&branch={1}"); ?>',
                 title: '<?php echo $viewType == 'line' ? '': $lang->tree->child ?>',
-                template: '<a href="javascript:;"><?php echo $viewType == 'line' ? '': $lang->tree->child?></a>'
+                template: '<a href="javascript:;"><?php echo $viewType == 'line' ? '': (strpos($viewType, 'doc') !== false ? $lang->doc->childType : $lang->tree->child)?></a>'
             }
         },
         action: function(event)