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:
hufangzhou
2021-01-20 15:22:37 +08:00
parent 11cbb689a5 f172a5d9e2
commit 5b089ec3dd
21 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/create.css
+1 -1
View File
@@ -28,6 +28,7 @@ html[lang='en'] #deadlineTd .input-group-addon{padding: 5px 18px}
.input-group-addon.w-90px{min-width:90px;}
.input-group .input-group-btn .btn{padding: 6px 12px;}
.input-group .chosen-container{min-width: 80px;}
#all{border-left:none}
.pri-selector > .btn {padding: 5px 8px!important; width: 100%;}
@@ -38,7 +39,6 @@ html[lang='en'] #deadlineTd .input-group-addon{padding: 5px 18px}
.title-group .chosen-container {width: 1%!important; min-width: 70px;}
.title-group #severity + .chosen-container > .chosen-single {border-radius: 0!important;}
.title-group #pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;}
.title-group .has-icon-right{min-width:700px}
#mainContent .center-block{padding-bottom:40px;}
#typeBox {width:180px;}
module/bug/view/create.html.php
+1 -1
View File
@@ -314,6 +314,6 @@ js::set('isStepsTemplate', $isStepsTemplate);
</div>
<?php js::set('bugModule', $lang->bug->module);?>
<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/common/lang/de.php
+2 -2
View File
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
$lang->system->menu = new stdclass();
$lang->system->menu->company = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
$lang->system->menu->scrum = array('link' => 'Scrum Model|custom|configurescrum|');
$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|', 'alias' => 'browse');
$lang->subject = new stdclass();
$lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
$lang->project->subMenu->more->action = array('link' => 'Verlauf|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => 'Übersicht|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/common/lang/en.php
+2 -2
View File
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
$lang->system->menu = new stdclass();
$lang->system->menu->company = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
$lang->system->menu->scrum = array('link' => 'Scrum Model|custom|configurescrum|');
$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|', 'alias' => 'browse');
$lang->subject = new stdclass();
$lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
$lang->project->subMenu->more->action = array('link' => 'Dynamics|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => 'Overview|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/common/lang/fr.php
+2 -2
View File
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
$lang->system->menu = new stdclass();
$lang->system->menu->company = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
$lang->system->menu->scrum = array('link' => 'Scrum Model|custom|configurescrum|');
$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|', 'alias' => 'browse');
$lang->subject = new stdclass();
$lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
$lang->project->subMenu->more->action = array('link' => 'Historique|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => "Vue d'ensemble|project|view|projectID=%s", 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/common/lang/vi.php
+2 -2
View File
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
$lang->system->menu = new stdclass();
$lang->system->menu->company = array('link' => 'Global Settings|subject|browse|', 'subModule' => 'holiday');
$lang->system->menu->scrum = array('link' => 'Scrum Model|custom|configurescrum|');
$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|');
$lang->system->menu->waterfall = array('link' => 'Waterfall Model|stage|settype|', 'alias' => 'browse');
$lang->subject = new stdclass();
$lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => 'Whitelist|project|wh
$lang->project->subMenu->more->action = array('link' => 'Lịch sử|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => 'Tổng quan|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/common/lang/zh-cn.php
+2 -2
View File
@@ -210,7 +210,7 @@ $lang->system = new stdclass();
$lang->system->menu = new stdclass();
$lang->system->menu->company = array('link' => '全局设置|subject|browse|', 'subModule' => 'holiday');
$lang->system->menu->scrum = array('link' => '敏捷模型|custom|configurescrum|');
$lang->system->menu->waterfall = array('link' => '瀑布模型|stage|settype|');
$lang->system->menu->waterfall = array('link' => '瀑布模型|stage|settype|', 'alias' => 'browse');
$lang->subject = new stdclass();
$lang->subject->menu = new stdclass();
@@ -378,7 +378,7 @@ $lang->project->subMenu->more->whitelist = array('link' => '白名单|project|wh
$lang->project->subMenu->more->action = array('link' => '动态|project|dynamic|projectID=%s');
$lang->project->subMenu->more->view = array('link' => '概况|project|view|projectID=%s', 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,other,';
$lang->project->dividerMenu = ',project,programplan,projectbuild,story,doc,other,';
$lang->task = new stdclass();
$lang->build = new stdclass();
module/my/view/testtask.html.php
+3 -3
View File
@@ -35,11 +35,11 @@
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th> <?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
<th class='w-120px'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
<th class='w-100px'><?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
<th class='w-120px'><?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
<th class='w-90px'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
<th class='w-90px'> <?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
<th class='w-80px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-actions-5'><?php echo $lang->actions;?></th>
<th class='c-actions-6'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -48,7 +48,7 @@
<td class="c-id"><?php printf('%03d', $task->id);?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id", '', '', $task->PRJ), $task->name, '', "data-group='project'");?></td>
<td class='nobr'><?php echo $task->projectName?></td>
<td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', '', $task->PRJ), $task->buildName, '', "data-group='project'"));?></td>
<td class='nobr' title='<?php echo $task->buildName;?>'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', '', $task->PRJ), $task->buildName, '', "data-group='project'"));?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td title='<?php echo $task->status?>'><span class="status-task status-<?php echo $task->status?>"><?php echo $this->processStatus('testtask', $task);?></span></td>
module/product/control.php
+1 -1
View File
@@ -376,7 +376,7 @@ class product extends control
/* Change the projects set of the program. */
if(($_POST['program'] != $product->program) and $projects)
{
$this->product->updateProjects($projects, $_POST['program'], $_POST['comfirmChange']);
$this->product->updateProjects($projects, $_POST['program'], $_POST['confirmChange']);
}
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
module/product/js/edit.js
+2 -2
View File
@@ -26,11 +26,11 @@ $(function()
if(singleLinkProjects) alert(PGMChangeTip);
if(multipleLinkProjects && confirm(confirmChangePGM))
{
$('#comfirmChange').val('yes');
$('#confirmChange').val('yes');
}
else
{
$('#comfirmChange').val('no');
$('#confirmChange').val('no');
}
}
})
module/product/model.php
+3 -3
View File
@@ -545,7 +545,7 @@ class productModel extends model
->setIF($this->post->acl == 'open', 'whitelist', '')
->join('whitelist', ',')
->stripTags($this->config->product->editor->edit['id'], $this->config->allowedTags)
->remove('uid,comfirmChange')
->remove('uid,confirmChange')
->get();
$product = $this->loadModel('file')->processImgURL($product, $this->config->product->editor->edit['id'], $this->post->uid);
@@ -1516,11 +1516,11 @@ class productModel extends model
* @access public
* @return void
*/
public function updateProjects($projects, $programID, $comfirmChange = 'no')
public function updateProjects($projects, $programID, $confirmChange = 'no')
{
foreach($projects as $project)
{
if((count($project->product) == 1) or $comfirmChange == 'yes')
if((count($project->product) == 1) or $confirmChange == 'yes')
{
$this->dao->update(TABLE_PROJECT)
->set('parent')->eq($programID)
module/product/view/edit.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
<tr>
<th class='w-140px'><?php echo $lang->product->program;?></th>
<td><?php echo html::select('program', $programs, $product->program, "class='form-control chosen'");?></td>
<td><?php echo html::hidden('comfirmChange', 'no');?></td>
<td><?php echo html::hidden('confirmChange', 'no');?></td>
</tr>
<?php endif;?>
<tr>
module/programplan/model.php
+2 -2
View File
@@ -182,7 +182,7 @@ class programplanModel extends model
$data = new stdclass();
$data->id = $plan->id;
$data->type = 'plan';
$data->text = empty($plan->milestone) ? $plan->name : $isMilestone . $plan->name;
$data->text = empty($plan->milestone) ? $plan->name : $plan->name . $isMilestone ;
$data->percent = $plan->percent;
$data->attribute = zget($this->lang->stage->typeList, $plan->attribute);
$data->milestone = zget($this->lang->programplan->milestoneList, $plan->milestone);
@@ -736,7 +736,7 @@ class programplanModel extends model
echo sprintf('%03d', $plan->id);
break;
case 'name':
$milestoneFlag = $plan->milestone ? " <i class='icon icon-flag' title={$this->lang->programplan->milestone} style='color:red'></i>" : '';
$milestoneFlag = $plan->milestone ? " <i class='icon icon-flag red' title={$this->lang->programplan->milestone}'></i>" : '';
if($plan->grade > 1) echo '<span class="label label-badge label-light" title="' . $this->lang->programplan->children . '">' . $this->lang->programplan->childrenAB . '</span> ';
echo $plan->name . $milestoneFlag;
if(!empty($plan->children)) echo '<a class="plan-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-double-right"></i></a>';
module/projectrelease/model.php
+2 -1
View File
@@ -179,7 +179,8 @@ class projectreleaseModel extends model
$this->dao->insert(TABLE_RELEASE)->data($release)
->autoCheck()
->batchCheck($this->config->release->create->requiredFields, 'notempty')
->check('name', 'unique', "product = {$release->product} AND branch = {$release->branch} AND deleted = '0'");
->check('name', 'unique', "product = {$release->product} AND branch = {$release->branch} AND deleted = '0'")
->exec();
if(dao::isError())
{
module/projectrelease/view/browse.html.php
+1 -1
View File
@@ -62,7 +62,7 @@
<td><?php echo html::a(inlink('view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
<td>
<?php
$flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';
$flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';
echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon;
?>
</td>
module/projectrelease/view/view.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<div class='page-title'>
<span class='label label-id'><?php echo $release->id;?></span>
<span class='text' title='<?php echo $release->name;?>'><?php echo $release->name;?></span>
<?php $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';?>
<?php $flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';?>
<?php echo $flagIcon;?>
<?php if($release->deleted):?>
<span class='label label-danger'><?php echo $lang->release->deleted;?></span>
module/release/view/browse.html.php
+1 -1
View File
@@ -64,7 +64,7 @@
<td><?php echo html::a(inlink('view', "releaseID=$release->id"), sprintf('%03d', $release->id));?></td>
<td>
<?php
$flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';
$flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';
echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon;
?>
</td>
module/release/view/view.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<div class='page-title'>
<span class='label label-id'><?php echo $release->id;?></span>
<span class='text' title='<?php echo $release->name;?>'><?php echo $release->name;?></span>
<?php $flagIcon = $release->marker ? "<icon class='icon icon-flag-alt' title='{$lang->release->marker}'></icon> " : '';?>
<?php $flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';?>
<?php echo $flagIcon;?>
<?php if($release->deleted):?>
<span class='label label-danger'><?php echo $lang->release->deleted;?></span>
module/todo/view/view.html.php
+1
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php if(!$todo->private or ($todo->private and $todo->account == $app->user->account)):?>
<style>.chosen-container .chosen-results{max-height: 170px; overflow-y: initial;}</style>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<div class="page-title">
module/workestimation/model.php
+4 -1
View File
@@ -46,7 +46,10 @@ class workestimationModel extends model
*/
public function save($projectID)
{
$data = fixer::input('post')->setDefault('PRJ', $projectID)->get();
$data = fixer::input('post')
->setDefault('PRJ', $projectID)
->setIF(!isset($_POST['productivity']), 'productivity', 1)
->get();
$budget = $this->getBudget($projectID);
if(!empty($budget)) $data->id = $budget->id;
module/workestimation/view/index.html.php
+3 -2
View File
@@ -36,10 +36,11 @@
<th><?php echo $lang->workestimation->productivity;?></th>
<td>
<div class='input-group'>
<?php echo html::input('productivity', zget($budget, 'productivity', ''), "class='form-control'");?>
<?php $disabled = $hourPoint == 0 ? 'disabled' : '';?>
<?php echo html::input('productivity', zget($budget, 'productivity', ''), "class='form-control' $disabled");?>
<span class='input-group-addon unify-padding'>
<?php
if($hourPoint == 0) echo $lang->custom->unitList['efficiency'] . $lang->hourCommon;
if($hourPoint == 0) echo $lang->hourCommon;
if($hourPoint == 1) echo $lang->custom->unitList['efficiency'] . $lang->hourCommon;
if($hourPoint == 2) echo $lang->custom->unitList['manhour'] . $lang->custom->unitList['loc'];
?>