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

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';

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';

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        = '文档库类型';

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;
     }
 }

module/productplan/js/create.js

@@ -40,4 +40,9 @@ $('#begin').on('change', function()
 {
     $("#end").val('');
     $("input:radio[name='delta']").attr("checked",false);
-});
+});
+
+$('#end').on('change', function()
+{
+    $("input:radio[name='delta']").attr("checked", false);
+});

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()

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)