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

module/bug/model.php

@@ -2430,7 +2430,7 @@ class bugModel extends model
         $canBatchResolve      = common::hasPriv('bug', 'batchResolve');
         $canBatchAssignTo     = common::hasPriv('bug', 'batchAssignTo');
 
-        $canBatchAction = $canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo or $canBatchCancel;
+        $canBatchAction = $canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchActivate or $canBatchChangeBranch or $canBatchChangeModule or $canBatchResolve or $canBatchAssignTo;
 
         $canView = common::hasPriv('bug', 'view');
         $bugLink = inlink('view', "bugID=$bug->id");

module/build/control.php

@@ -25,6 +25,7 @@ class build extends control
             $buildID = $this->build->create($projectID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('build', $buildID, 'opened');
+            if(isonlybody()) die(js::closeModal('parent.parent', '', "function(){parent.parent.loadProjectBuilds($projectID);}"));
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID")));
         }
 
@@ -357,7 +358,7 @@ class build extends control
             {
                 if(empty($builds))
                 {
-                    echo html::a($this->createLink('build', 'create', "projectID=$projectID"), $this->lang->build->create, '_blank');
+                    echo html::a($this->createLink('build', 'create', "projectID=$projectID", '', $onlybody = true), $this->lang->build->create, '', "data-toggle='modal' data-type='iframe'");
                     echo '  ';
                     echo html::a("javascript:loadProjectBuilds($projectID)", $this->lang->refresh);
                 }

module/group/lang/resource.php

@@ -337,6 +337,8 @@ $lang->resource->project->updateOrder       = 'updateOrder';
 $lang->resource->project->kanban            = 'kanban';
 $lang->resource->project->printKanban       = 'printKanban';
 $lang->resource->project->tree              = 'tree';
+$lang->resource->project->treeTask          = 'treeTask';
+$lang->resource->project->treeStory         = 'treeStory';
 $lang->resource->project->all               = 'all';
 $lang->resource->project->kanbanHideCols    = 'kanbanHideCols';
 $lang->resource->project->kanbanColsColor   = 'kanbanColsColor';
@@ -382,12 +384,14 @@ $lang->project->methodOrder[170] = 'updateOrder';
 $lang->project->methodOrder[175] = 'kanban';
 $lang->project->methodOrder[180] = 'printKanban';
 $lang->project->methodOrder[185] = 'tree';
-$lang->project->methodOrder[190] = 'all';
-$lang->project->methodOrder[195] = 'kanbanHideCols';
-$lang->project->methodOrder[200] = 'kanbanColsColor';
-$lang->project->methodOrder[205] = 'export';
-$lang->project->methodOrder[210] = 'storyKanban';
-$lang->project->methodOrder[215] = 'storySort';
+$lang->project->methodOrder[190] = 'tree';
+$lang->project->methodOrder[195] = 'tree';
+$lang->project->methodOrder[200] = 'all';
+$lang->project->methodOrder[205] = 'kanbanHideCols';
+$lang->project->methodOrder[210] = 'kanbanColsColor';
+$lang->project->methodOrder[215] = 'export';
+$lang->project->methodOrder[220] = 'storyKanban';
+$lang->project->methodOrder[225] = 'storySort';
 
 /* Task. */
 $lang->resource->task = new stdclass();

module/project/lang/en.php

@@ -145,6 +145,8 @@ $lang->project->importPlanStories = 'Link Story From Plan';
 $lang->project->importBug         = 'Import Bugs';
 $lang->project->updateOrder       = 'Sort';
 $lang->project->tree              = 'Tree';
+$lang->project->treeTask          = 'Show Task';
+$lang->project->treeStory         = 'Show Story';
 $lang->project->storyKanban       = 'Story Kanban';
 $lang->project->storySort         = 'Sort Story';
 $lang->project->importPlanStory   = '' . $lang->projectCommon . ' is created!\nDo you want to iport stories linked to the plan?';

module/project/lang/zh-cn.php

@@ -145,6 +145,8 @@ $lang->project->importPlanStories = '按计划关联需求';
 $lang->project->importBug         = '导入Bug';
 $lang->project->updateOrder       = '排序';
 $lang->project->tree              = '树状图';
+$lang->project->treeTask          = '只看任务';
+$lang->project->treeStory         = '只看需求';
 $lang->project->storyKanban       = '需求看板';
 $lang->project->storySort         = '需求排序';
 $lang->project->importPlanStory   = '创建' . $lang->projectCommon . '成功！\n是否导入计划关联的相关需求？';

module/testtask/js/create.js

@@ -22,7 +22,7 @@ function loadProjectBuilds(projectID)
     selectedBuild = $('#build').val();
     if(!selectedBuild) selectedBuild = 0;
     link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild);
-    $('#buildBox').load(link, function(){$('#build').chosen(defaultChosenOptions);});
+    $('#buildBox').load(link, function(){$('#build').chosen(window.defaultChosenOptions);});
 }
 
 /**