Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/tanghucheng_fixbug' into 'sprint/185'

Browse Source 
* finish task #49421,49338.

See merge request easycorp/zentaopms!1838
This commit is contained in:
王怡栋
2022-02-17 08:20:10 +00:00
parent 3d519133fa 172443d36f
commit 218546e6c4
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/product/ext/config/lite.php
+7
View File
@@ -0,0 +1,7 @@
<?php
unset($config->product->search['fields']['stage']);
unset($config->product->search['fields']['product']);
unset($config->product->search['fields']['plan']);
unset($config->product->search['fields']['source']);
unset($config->product->search['fields']['sourceNote']);
unset($config->product->search['fields']['fromBug']);
extension/lite/product/ext/view/browse.lite.html.hook.php
-6
View File
@@ -1,6 +0,0 @@
<?php if($this->app->rawModule == 'projectstory'):?>
<script>
$('td.c-actions .icon-projectstory-unlinkStory').parent().remove();
$('td.c-actions .icon-testcase-create').parent().remove();
</script>
<?php endif;?>
extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
+2
View File
@@ -1,6 +1,8 @@
<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
<script>
$(function()
{
for(var index = 0; index <= 9; index++) $('#todoBatchAddForm').append(`<input type="hidden" name="vision[${index}]" id="vision[${index}]" value="lite">`);
$('#mainContent .main-header .pull-right.btn-toolbar').append(<?php echo json_encode($html)?>);
});
</script>
module/program/model.php
+1
View File
@@ -133,6 +133,7 @@ class programModel extends model
return $this->dao->select('*')->from(TABLE_PROGRAM)
->where('type')->in('program,project')
->andWhere('deleted')->eq(0)
->andWhere('vision')->eq($this->config->vision)
->beginIF(!$this->app->user->admin)
->andWhere('(id')->in($this->app->user->view->programs)
->orWhere('id')->in($this->app->user->view->projects)
module/story/model.php
+2 -2
View File
@@ -3982,9 +3982,9 @@ class storyModel extends model
common::printIcon('story', 'recall', $vars, $story, 'list', 'back', 'hiddenwin', '', '', '', $this->lang->story->recall);
common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true);
common::printIcon('story', 'edit', $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from");
if($story->type != 'requirement') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'");
if($story->type != 'requirement' and $this->config->vision != 'lite') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'");
if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite') common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'split', '', '', '', '', $this->lang->story->subdivide);
if($this->app->rawModule == 'projectstory') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin');
if($this->app->rawModule == 'projectstory' and $this->config->vision != 'lite') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin');
}
else
{