Merge branch 'sprint/fixbug_tanghucheng' into 'master'

* Fix bug #25334.

See merge request easycorp/zentaopms!6836

extension/lite/execution/ext/control/kanban.php

@@ -44,7 +44,7 @@ class myExecution extends execution
             $TRActions .= "<ul id='kanbanActionMenu' class='dropdown-menu pull-right'>";
             $width    = $this->app->getClientLang() == 'en' ? '750' : '650';
             if(common::hasPriv('kanban', 'createRegion')) $TRActions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createRegion, '', "class='iframe btn btn-link text-left'") . '</li>';
-            if(common::hasPriv('kanban', 'setLaneHeight')) $TRActions .= '<li>' . html::a(helper::createLink('kanban', 'setLaneHeight', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-size-height"></i>' . $this->lang->kanban->laneHeight, '', "class='iframe btn btn-link text-left' data-width=$width") . '</li>';
+            if(common::hasPriv('execution', 'setKanban')) $TRActions .= '<li>' . html::a(helper::createLink('execution', 'setKanban', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-size-height"></i>' . $this->lang->kanban->laneHeight, '', "class='iframe btn btn-link text-left' data-width=$width") . '</li>';
             $kanbanActions = '';
             if(common::hasPriv('execution', 'edit')) $kanbanActions .= '<li>' . html::a(helper::createLink('execution', 'edit', "executionID=$execution->id", '', true), '<i class="icon icon-edit"></i>' . $this->lang->kanban->edit, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';
             if(in_array('start', $executionActions)) $kanbanActions .= '<li>' . html::a(helper::createLink('execution', 'start', "executionID=$execution->id", '', true), '<i class="icon icon-play"></i>' . $this->lang->execution->start, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';

extension/lite/project/ext/config/lite.php

@@ -1,4 +1,9 @@
 <?php
 $config->project->list->exportFields = 'id,code,name,status,PM,desc';
 $config->project->datatable->defaultField = array('id', 'name', 'status', 'PM', 'begin', 'end', 'progress', 'actions');
+
 unset($config->project->datatable->fieldList['budget']);
+
+unset($config->project->search['fields']['hasProduct']);
+unset($config->project->search['fields']['parent']);
+unset($config->project->search['fields']['model']);

extension/lite/task/ext/view/batchcreate.html.php

@@ -14,6 +14,7 @@
 <?php include $this->app->getModuleRoot() . '/common/view/datepicker.html.php';?>
 <?php js::set('taskConsumed', $taskConsumed);?>
 <?php js::set('addChildTask', $lang->task->addChildTask);?>
+<?php js::set('isonlybody', isonlybody())?>
 <?php js::set('regionID', $regionID);?>
 <style>.c-lane,.c-region{width:150px;}</style>
 <div id="mainContent" class="main-content fade">

extension/lite/task/ext/view/create.html.php

@@ -103,7 +103,7 @@
         <tr>
           <th><?php echo $lang->task->story;?></th>
           <td colspan='3'>
-            <span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=story&_single"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
+            <span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=story&_single"), $lang->execution->linkStory, '', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
             <div class='input-group <?php if(empty($stories)) echo "hidden";?>'>
               <?php echo html::select('story', $stories, $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
               <span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>

module/story/control.php

@@ -476,7 +476,7 @@ class story extends control
         $this->view->URS              = $storyType == 'story' ? $this->story->getProductStoryPairs($productID, $branch, $moduleIdList, 'changing,active,reviewing', 'id_desc', 0, '', 'requirement') : '';
         $this->view->needReview       = ($this->app->user->account == $product->PO or $objectID > 0 or $this->config->story->needReview == 0 or !$this->story->checkForceReview()) ? "checked='checked'" : "";
         $this->view->type             = $storyType;
-        $this->view->category         = $category ? $category : 'feature';
+        $this->view->category         = !empty($category) ? $category : 'feature';
 
         $this->display();
     }

module/story/lang/zh-cn.php

@@ -449,7 +449,7 @@ $lang->story->chosen->reviewedBy = '选择评审人...';
 
 $lang->story->notice = new stdClass();
 $lang->story->notice->closed           = "您选择的{$lang->SRCommon}已经被关闭了！";
-$lang->story->notice->reviewerNotEmpty = '该需求需要评审，评审人员不能为空。';
+$lang->story->notice->reviewerNotEmpty = "该{$lang->SRCommon}需要评审，评审人员不能为空。";
 $lang->story->notice->changePlan       = '所属计划只能改为一条，修改后才能保存成功。';
 
 $lang->story->convertToTask = new stdClass();
@@ -468,20 +468,20 @@ $lang->story->categoryList['experience']  = '体验';
 $lang->story->categoryList['improve']     = '改进';
 $lang->story->categoryList['other']       = '其他';
 
-$lang->story->changeTip = '只有激活状态的需求，才能进行变更';
+$lang->story->changeTip = "只有激活状态的{$lang->SRCommon}，才能进行变更";
 
 $lang->story->reviewTip = array();
-$lang->story->reviewTip['active']      = '该需求已是激活状态，无需评审';
-$lang->story->reviewTip['notReviewer'] = '您不是该需求的评审人员，无法进行评审操作';
+$lang->story->reviewTip['active']      = "该{$lang->SRCommon}已是激活状态，无需评审";
+$lang->story->reviewTip['notReviewer'] = "您不是该{$lang->SRCommon}的评审人员，无法进行评审操作";
 $lang->story->reviewTip['reviewed']    = '您已评审';
 
 $lang->story->recallTip = array();
-$lang->story->recallTip['actived'] = '该需求未发起评审流程，无需撤销操作';
+$lang->story->recallTip['actived'] = "该{$lang->SRCommon}未发起评审流程，无需撤销操作";
 
 $lang->story->subDivideTip = array();
-$lang->story->subDivideTip['subStory']   = '子需求无法细分';
-$lang->story->subDivideTip['notWait']    = '该需求%s，无法进行细分操作';
-$lang->story->subDivideTip['notActive']  = '需求不是激活状态，无法进行细分操作';
+$lang->story->subDivideTip['subStory']   = "子{$lang->SRCommon}无法细分";
+$lang->story->subDivideTip['notWait']    = "该{$lang->SRCommon}%s，无法进行细分操作";
+$lang->story->subDivideTip['notActive']  = "{$lang->SRCommon}不是激活状态，无法进行细分操作";
 $lang->story->subDivideTip['twinsSplit'] = '孪生需求不可细分';
 
 $lang->story->featureBar['browse']['all']       = '全部';