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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
tianshujie98
2021-01-20 16:44:56 +08:00
parent 9e6ff0a9b2 fd672669f7
commit ee7c9937ac
23 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+3 -7
View File
@@ -313,15 +313,11 @@ class bug extends control
$this->action->create('todo', $output['todoID'], 'finished', '', "BUG:$bugID");
}
/* If link from no head then reload*/
if(isonlybody())
{
$this->executeHooks($bugID);
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
}
$this->executeHooks($bugID);
/* If link from no head then reload*/
if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
if(defined('RUN_MODE') && RUN_MODE == 'api') $this->send(array('status' => 'success', 'data' => $bugID));
if(isset($output['projectID']))
module/common/lang/zh-cn.php
+2 -2
View File
@@ -924,7 +924,7 @@ $lang->menu->scrum->ci = '代码|repo|browse';
$lang->menu->scrum->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}');
$lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse');
$lang->menu->scrum->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
$lang->menu->scrum->projectsetting = array('link' => '设置|program|prjview|project={PROJECT}', 'subModule' => 'workestimation,durationestimation,budget,pssp', 'alias' => 'prjedit,prjmanageproducts,prjgroup,prjmanagemembers,prjmanageview,prjmanagepriv');
$lang->menu->scrum->projectsetting = array('link' => '设置|program|prjview|project={PROJECT}', 'subModule' => 'workestimation,durationestimation,budget,pssp', 'alias' => 'prjedit,prjmanageproducts,prjgroup,prjmanagemembers,prjmanageview,prjmanagepriv,prjwhitelist,prjaddwhitelist');
$lang->scrum = new stdclass();
$lang->scrum->subMenu = new stdclass();
@@ -957,7 +957,7 @@ $lang->menu->waterfall->qa = '测试|qa|index';
$lang->menu->waterfall->projectrelease = array('link' => '发布|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}');
$lang->menu->waterfall->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder,nc');
$lang->menu->waterfall->projectsetting = array('link' => '设置|program|prjview|project={PROJECT}', 'subModule' => 'workestimation,durationestimation,budget,pssp', 'alias' => 'prjedit,prjmanageproducts,prjgroup,prjmanagemembers,prjmanageview,prjmanagepriv');
$lang->menu->waterfall->projectsetting = array('link' => '设置|program|prjview|project={PROJECT}', 'subModule' => 'workestimation,durationestimation,budget,pssp', 'alias' => 'prjedit,prjmanageproducts,prjgroup,prjmanagemembers,prjmanageview,prjmanagepriv,prjwhitelist,prjaddwhitelist');
$lang->waterfall = new stdclass();
$lang->waterfall->subMenu = new stdclass();
module/common/model.php
+1
View File
@@ -1733,6 +1733,7 @@ EOD;
/* If is the program admin, have all program privs. */
$inProject = isset($lang->navGroup->$module) && $lang->navGroup->$module == 'project';
if($module == 'program' && strpos($method, 'prj') !== false) $inProject = true;
if($inProject && $app->session->PRJ && strpos(",{$app->user->rights['projects']},", ",{$app->session->PRJ},") !== false) return true;
/* If not super admin, check the rights. */
module/group/lang/resource.php
+2 -2
View File
@@ -492,12 +492,12 @@ $lang->resource->projectstory = new stdclass();
$lang->resource->projectstory->story = 'story';
$lang->resource->projectstory->track = 'track';
$lang->resource->projectstory->linkStory = 'linkStory';
$lang->resource->projectstory->unLinkStory = 'unLinkStory';
$lang->resource->projectstory->unlinkStory = 'unlinkStory';
$lang->productplan->methodOrder[5] = 'story';
$lang->productplan->methodOrder[10] = 'track';
$lang->productplan->methodOrder[15] = 'linkStory';
$lang->productplan->methodOrder[20] = 'unLinkStory';
$lang->productplan->methodOrder[20] = 'unlinkStory';
/* Release. */
$lang->resource->release = new stdclass();
module/group/model.php
+1 -1
View File
@@ -453,7 +453,7 @@ class groupModel extends model
$data = new stdclass();
$data->group = $groupID;
$data->account = $account;
$data->program = implode($programs[$account], ',');
$data->PRJ = implode($programs[$account], ',');
$this->dao->replace(TABLE_USERGROUP)->data($data)->exec();
foreach($programs[$account] as $programID)
module/group/view/manageprjadmin.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
</td>
<td class='pv-10px' colspan='2'>
<div class='input-group'>
<span class='input-group-addon'> <?php echo $lang->group->program;?></span>
<span class='input-group-addon'> <?php echo $lang->group->PRJ;?></span>
<?php echo html::select('program[0][]', $programs, '', "class='form-control chosen' multiple");?>
</div>
</td>
module/personnel/view/whitelist.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<div id='mainContent' class='main-row fade'>
<div class='main-col'>
<?php if(!empty($whitelist)):?>
<form class='main-table table-user' data-ride='table' action='' method='post' id='userListForm'>
<form class='main-table table-user' action='' method='post' id='userListForm'>
<table class='table has-sort-head' id='userList'>
<thead>
<tr>
module/program/control.php
+2 -2
View File
@@ -991,7 +991,7 @@ class program extends control
$this->action->logHistory($actionID, $changes);
}
$locateLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse');
$locateLink = inLink('PRJView', "projectID=$projectID");
if($from == 'pgmbrowse') $locateLink = inLink('PGMBrowse');
if($from == 'pgmproject') $locateLink = inLink('PGMProject', "programID=$programID");
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
@@ -1705,7 +1705,7 @@ class program extends control
$diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
if($diffProducts) $this->loadModel('action')->create('project', $projectID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
$locateLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJBrowse');
$locateLink = inLink('PRJManageProducts', "projectID=$projectID");
if($from == 'pgmbrowse') $locateLink = inLink('PGMBrowse');
if($from == 'pgmproject') $locateLink = inLink('PGMProject', "programID=$programID");
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
module/program/model.php
+2 -2
View File
@@ -1716,10 +1716,10 @@ class programModel extends model
}
$PRJProgram = '';
if($id == 'PRJProgram')
if($id == 'PRJProgram' and $project->parent != 0)
{
$programList = $this->getPGMPairs();
$programIndex = strpos($project->path, $programID);
$programIndex = $programID ? strpos($project->path, (string)$programID) : 0;
$projectIndex = strpos($project->path, $project->id);
$programPath = explode(',' , substr($project->path, $programIndex, $projectIndex - $programIndex));
foreach($programPath as $program)
module/program/view/prjview.html.php
+6 -6
View File
@@ -143,16 +143,16 @@
if(!$project->deleted)
{
echo "<div class='divider'></div>";
common::printIcon('program', 'PRJStart', "projectID=$project->id", $project, 'button', 'play', '', 'iframe', true);
common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'button', 'magic', '', 'iframe', true);
common::printIcon('program', 'PRJSuspend', "projectID=$project->id", $project, 'button', 'pause', '', 'iframe', true);
common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'button', 'off', '', 'iframe', true);
common::printIcon('program', 'PRJStart', "projectID=$project->id", $project, 'button', 'play', '', 'iframe', true, '', $lang->project->start);
common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'button', 'magic', '', 'iframe', true, '', $lang->project->activate);
common::printIcon('program', 'PRJSuspend', "projectID=$project->id", $project, 'button', 'pause', '', 'iframe', true, '', $lang->project->suspend);
common::printIcon('program', 'PRJClose', "projectID=$project->id", $project, 'button', 'off', '', 'iframe', true, '', $lang->close);
echo $this->buildOperateMenu($project, 'view');
echo "<div class='divider'></div>";
common::printIcon('program', 'PRJEdit', $params, $project, 'button', 'edit');
common::printIcon('program', 'PRJDelete', $params, $project, 'button', 'trash', 'hiddenwin');
common::printIcon('program', 'PRJEdit', $params, $project, 'button', 'edit', '', '', '', '', $lang->close);
common::printIcon('program', 'PRJDelete', $params, $project, 'button', 'trash', 'hiddenwin', '', '', '', $lang->delete);
}
?>
</div>
module/project/view/linkstory.html.php
+2 -2
View File
@@ -25,7 +25,7 @@
<?php endif;?>
</div>
<div class='btn-toolbar pull-right'>
<?php common::printBack($this->server->http_referer, 'btn btn-link');?>
<?php common::printBack($this->createLink($this->app->rawModule, 'story'), 'btn btn-link');?>
</div>
</div>
<div id="mainContent">
@@ -81,7 +81,7 @@
<td><?php if(isset($branchGroups[$story->product][$story->branch])) echo $branchGroups[$story->product][$story->branch];?></td>
<?php endif;?>
<td><?php echo zget($users, $story->openedBy);?></td>
<td class='text-center'><?php echo $story->estimate;?></td>
<td class='text-center'><?php echo $story->estimate . $config->hourUnit;?></td>
</tr>
<?php $storyCount++;?>
<?php endforeach;?>
module/project/view/storykanban.html.php
+1 -1
View File
@@ -80,7 +80,7 @@ $account = $this->app->user->account;
<?php if($canBeChanged and common::hasPriv('project', 'unlinkStory')):?>
<div class='pull-right'><?php echo html::a($this->createLink('project', 'unlinkStory', "projectID=$projectID&story=$story->id"), "<i class='icon icon-unlink icon-sm'></i>", 'hiddenwin', "title='{$lang->project->unlinkStory}'");?></div>
<?php endif;?>
<div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . 'h ';?></div>
<div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . "$config->hourUnit ";?></div>
</div>
</div>
<?php endforeach?>
module/projectstory/lang/de.php
+1 -1
View File
@@ -4,7 +4,7 @@ $lang->projectstory->index = 'Fordern Sie Homepage';
$lang->projectstory->story = $lang->generalSR;
$lang->projectstory->track = 'Matrix der Verfolgung';
$lang->projectstory->linkStory = 'Linked' . $lang->SRCommon;
$lang->projectstory->unLinkStory = 'UnLinked' . $lang->SRCommon;
$lang->projectstory->unlinkStory = 'Unlinked' . $lang->SRCommon;
global $app;
$app->loadLang('product');
module/projectstory/lang/en.php
+1 -1
View File
@@ -4,7 +4,7 @@ $lang->projectstory->index = 'Request Home';
$lang->projectstory->story = $lang->generalSR;
$lang->projectstory->track = 'Tracking Matrix';
$lang->projectstory->linkStory = 'Linked' . $lang->SRCommon;
$lang->projectstory->unLinkStory = 'UnLinked' . $lang->SRCommon;
$lang->projectstory->unlinkStory = 'Unlinked' . $lang->SRCommon;
global $app;
$app->loadLang('product');
module/projectstory/lang/fr.php
+1 -1
View File
@@ -4,7 +4,7 @@ $lang->projectstory->index = 'Exigences Accueil';
$lang->projectstory->story = $lang->generalSR;
$lang->projectstory->track = 'Matrice de suivi';
$lang->projectstory->linkStory = 'Linked' . $lang->SRCommon;
$lang->projectstory->unLinkStory = 'UnLinked' . $lang->SRCommon;
$lang->projectstory->unlinkStory = 'Unlinked' . $lang->SRCommon;
global $app;
$app->loadLang('product');
module/projectstory/lang/vi.php
+1 -1
View File
@@ -4,7 +4,7 @@ $lang->projectstory->index = 'Yêu cầu trang nhà';
$lang->projectstory->story = $lang->generalSR;
$lang->projectstory->track = 'Theo dõi ma trận';
$lang->projectstory->linkStory = 'Linked' . $lang->SRCommon;
$lang->projectstory->unLinkStory = 'UnLinked' . $lang->SRCommon;
$lang->projectstory->unlinkStory = 'Unlinked' . $lang->SRCommon;
global $app;
$app->loadLang('product');
module/projectstory/lang/zh-cn.php
+1 -1
View File
@@ -4,7 +4,7 @@ $lang->projectstory->index = '需求主页';
$lang->projectstory->story = $lang->generalSR;
$lang->projectstory->track = '跟踪矩阵';
$lang->projectstory->linkStory = '关联' . $lang->SRCommon;
$lang->projectstory->unLinkStory = '移除' . $lang->SRCommon;
$lang->projectstory->unlinkStory = '移除' . $lang->SRCommon;
global $app;
$app->loadLang('product');
module/projectstory/lang/zh-tw.php
+1 -1
View File
@@ -4,7 +4,7 @@ $lang->projectstory->index = '需求主頁';
$lang->projectstory->story = $lang->generalSR;
$lang->projectstory->track = '跟蹤矩陣';
$lang->projectstory->linkStory = '關聯' . $lang->SRCommon;
$lang->projectstory->unLinkStory = '移除' . $lang->SRCommon;
$lang->projectstory->unlinkStory = '移除' . $lang->SRCommon;
global $app;
$app->loadLang('product');
module/story/control.php
+3 -6
View File
@@ -146,14 +146,11 @@ class story extends control
$this->action->create('todo', $todoID, 'finished', '', "STORY:$storyID");
}
if(isonlybody())
{
$this->executeHooks($storyID);
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
}
$this->executeHooks($storyID);
/* If link from no head then reload*/
if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
if($this->post->newStory)
{
$response['message'] = $this->lang->story->successSaved . $this->lang->story->newStory;
module/story/view/create.html.php
+1 -1
View File
@@ -252,6 +252,6 @@
<?php js::set('storyModule', $lang->story->module);?>
<?php js::set('storyType', $type);?>
<script>
$(function() {parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
$(function(){parent.$('body.hide-modal-close').removeClass('hide-modal-close');})
</script>
<?php include '../../common/view/footer.html.php';?>
module/task/control.php
+3 -7
View File
@@ -128,15 +128,11 @@ class task extends control
$this->action->create('todo', $todoID, 'finished', '', "TASK:$taskID");
}
/* If link from no head then reload*/
if(isonlybody())
{
$this->executeHooks($taskID);
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
}
$this->executeHooks($taskID);
/* If link from no head then reload*/
if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
/* Locate the browser. */
if($this->app->getViewType() == 'xhtml')
{
module/task/view/create.html.php
+1 -1
View File
@@ -297,6 +297,6 @@
<?php js::set('testStoryIdList', $testStoryIdList);?>
<?php js::set('projectID', $project->id);?>
<script>
$(function() {parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
$(function(){parent.$('body.hide-modal-close').removeClass('hide-modal-close');})
</script>
<?php include '../../common/view/footer.html.php';?>
module/user/view/story.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
<td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
<td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo $story->estimate;?></td>
<td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
</tr>