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

Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
holan20180123
2021-07-22 11:33:43 +08:00
parent 90c3ce0e81 17780ea4a1
commit 260c129f30
15 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/lang/de.php
+1
View File
@@ -59,6 +59,7 @@ $lang->bug->resolvedBuild = 'Lösungs Build';
$lang->bug->resolvedDate = 'Gelöst am';
$lang->bug->resolvedDateAB = 'Gelöst';
$lang->bug->deadline = 'Fällig am';
$lang->bug->deadlineAB = 'Fällig';
$lang->bug->plan = 'Plan';
$lang->bug->closedBy = 'Geschlossen von';
$lang->bug->closedDate = 'Geschlossen am';
module/bug/lang/en.php
+1
View File
@@ -60,6 +60,7 @@ $lang->bug->resolvedBuild = 'Build';
$lang->bug->resolvedDate = 'Resolved Date';
$lang->bug->resolvedDateAB = 'ResolvedDate';
$lang->bug->deadline = 'Deadline';
$lang->bug->deadlineAB = 'Deadline';
$lang->bug->plan = 'Plan';
$lang->bug->closedBy = 'ClosedBy';
$lang->bug->closedDate = 'ClosedDate';
module/bug/lang/fr.php
+1
View File
@@ -59,6 +59,7 @@ $lang->bug->resolvedBuild = 'Build';
$lang->bug->resolvedDate = 'Date Correction';
$lang->bug->resolvedDateAB = 'Date Correction';
$lang->bug->deadline = 'Date Butoir';
$lang->bug->deadlineAB = 'Butoir';
$lang->bug->plan = 'Plan';
$lang->bug->closedBy = 'Fermé par';
$lang->bug->closedDate = 'Date Fermeture';
module/bug/lang/vi.php
+1
View File
@@ -59,6 +59,7 @@ $lang->bug->resolvedBuild = 'Bản dựng';
$lang->bug->resolvedDate = 'Ngày giải quyết';
$lang->bug->resolvedDateAB = 'Ngày giải quyết';
$lang->bug->deadline = 'Hạn chót';
$lang->bug->deadlineAB = 'Hạn chót';
$lang->bug->plan = 'Kế hoạch';
$lang->bug->closedBy = 'Người đóng';
$lang->bug->closedDate = 'Ngày đóng';
module/bug/lang/zh-cn.php
+1
View File
@@ -60,6 +60,7 @@ $lang->bug->resolvedBuild = '解决版本';
$lang->bug->resolvedDate = '解决日期';
$lang->bug->resolvedDateAB = '解决日期';
$lang->bug->deadline = '截止日期';
$lang->bug->deadlineAB = '截止';
$lang->bug->plan = '所属' . '计划';
$lang->bug->closedBy = '由谁关闭';
$lang->bug->closedDate = '关闭日期';
module/doc/control.php
+8 -1
View File
@@ -314,6 +314,9 @@ class doc extends control
else
{
$this->app->rawMethod = $objectType;
unset($this->lang->doc->menu->product['subMenu']);
if($this->config->systemMode == 'new') unset($this->lang->doc->menu->project['subMenu']);
unset($this->lang->doc->menu->custom['subMenu']);
}
$lib = $this->doc->getLibByID($libID);
@@ -388,7 +391,7 @@ class doc extends control
$lib = $this->doc->getLibByID($libID);
$type = $lib->type;
/* set menus. */
/* Set menus. */
if($this->app->openApp == 'product')
{
$this->product->setMenu($objectID);
@@ -415,6 +418,10 @@ class doc extends control
{
$this->app->rawMethod = $objectType;
unset($this->lang->doc->menu->product['subMenu']);
if($this->config->systemMode == 'new') unset($this->lang->doc->menu->project['subMenu']);
unset($this->lang->doc->menu->custom['subMenu']);
/* High light menu. */
if(strpos(',product,project,execution,custom,book,', ",$objectType,") !== false)
{
module/doc/model.php
+2 -2
View File
@@ -1902,7 +1902,7 @@ class docModel extends model
foreach($moduleDocs[0] as $doc)
{
if(!$docID) $docID = $doc->id;
$treeMenu[0] .= '<li' . ($doc->id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$rootID&docID={$doc->id}"), $doc->title, '', "data-app='{$this->app->openApp}'") . '</li>';
$treeMenu[0] .= '<li' . ($doc->id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$rootID&docID={$doc->id}"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "data-app='{$this->app->openApp}'") . '</li>';
}
}
@@ -1934,7 +1934,7 @@ class docModel extends model
foreach($moduleDocs[$module->id] as $doc)
{
if(!$docID) $docID = $doc->id;
$treeMenu[$module->id] .= '<li' . ($doc->id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), $doc->title, '', "data-app='{$this->app->openApp}'") . '</li>';
$treeMenu[$module->id] .= '<li' . ($doc->id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title, '', "data-app='{$this->app->openApp}'") . '</li>';
}
}
module/doc/view/content.html.php
+3
View File
@@ -1,3 +1,6 @@
<style>
.title {font-size: 20px !important;}
</style>
<?php js::set('confirmDelete', $lang->doc->confirmDelete);?>
<?php
$sessionString = $config->requestType == 'PATH_INFO' ? '?' : '&';
module/execution/view/bug.html.php
+2
View File
@@ -59,6 +59,7 @@
<th class='c-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-70px text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->bug->deadlineAB);?></th>
<th class='w-110px c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-100px'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='w-100px'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
@@ -101,6 +102,7 @@
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left' title="<?php echo $bug->title?>"><?php echo html::a($viewLink, $bug->title, null, "style='color: $bug->color' data-app={$this->app->openApp}");?></td>
<td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
<td class='text-center'><?php if(substr($bug->deadline, 0, 4) > 0) echo substr($bug->deadline, 5, 6);?></td>
<td class='c-assignedTo has-btn text-left'><?php $this->bug->printAssignedHtml($bug, $users);?></td>
<td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
<td><?php echo zget($lang->bug->resolutionList, $bug->resolution);?></td>
module/job/control.php
+14
View File
@@ -248,4 +248,18 @@ class job extends control
echo js::alert(sprintf($this->lang->job->sendExec, zget($this->lang->compile->statusList, $status)));
die(js::reload('parent'));
}
/**
* AJAX: Get product by repo.
*
* @param int $repoID
* @access public
* @return void
*/
public function ajaxGetProductByRepo($repoID)
{
$repo = $this->loadModel('repo')->getRepoByID($repoID);
if($repo) return $repo->product;
die(js::error("Access Violation. 非法访问。"));
}
}
module/my/view/bug.html.php
+9 -3
View File
@@ -61,13 +61,16 @@
<?php if($type != 'openedBy'): ?>
<th class='w-90px'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<?php endif;?>
<?php if($app->rawMethod == 'work'):?>
<th class='w-70px text-center'><?php common::printOrderLink('deadline', $orderBy, $vars, $lang->bug->deadlineAB);?></th>
<?php endif;?>
<?php if($type != 'assignedTo'): ?>
<th class='w-110px c-assignedTo'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
<th class='w-110px c-assignedTo'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
<?php endif;?>
<?php if($type != 'resolvedBy'): ?>
<th class='w-100px'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-100px'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<?php endif;?>
<th class='w-100px'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='w-100px'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions-5'> <?php echo $lang->actions;?></th>
</tr>
</thead>
@@ -110,6 +113,9 @@
<?php if($type != 'openedBy'): ?>
<td><?php echo zget($users, $bug->openedBy);?></td>
<?php endif;?>
<?php if($app->rawMethod == 'work'):?>
<td class='text-center'><?php if(substr($bug->deadline, 0, 4) > 0) echo substr($bug->deadline, 5, 6);?></td>
<?php endif;?>
<?php if($type != 'assignedTo'): ?>
<td class='c-assignedTo has-btn'><?php $this->bug->printAssignedHtml($bug, $users);?></td>
<?php endif;?>
module/my/view/task.html.php
+6
View File
@@ -54,6 +54,9 @@
<?php if($type != 'openedBy'): ?>
<th class='c-user w-90px'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<?php endif;?>
<?php if($app->rawMethod == 'work'):?>
<th class='w-70px text-center'> <?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
<?php endif;?>
<?php if($type != 'assignedTo'): ?>
<th class='c-assignedTo w-110px'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedTo);?></th>
<?php endif;?>
@@ -91,6 +94,9 @@
<?php if($type != 'openedBy'): ?>
<td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
<?php endif;?>
<?php if($app->rawMethod == 'work'):?>
<td class="text-center <?php echo isset($task->delay) ? 'delayed' : '';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?></td>
<?php endif;?>
<?php if($type != 'assignedTo'): ?>
<td class="c-assignedTo has-btn"> <?php $this->task->printAssignedHtml($task, $users);?></td>
<?php endif;?>
module/program/control.php
+1 -1
View File
@@ -28,7 +28,7 @@ class program extends control
*/
public function browse($status = 'all', $orderBy = 'order_asc')
{
if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->program->create, '', "class='btn btn-secondary'");
if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), "<i class='icon icon-plus'></i>" . $this->lang->program->create, '', "class='btn btn-primary'");
$this->session->set('programList', $this->app->getURI(true), 'program');
$this->session->set('projectList', $this->app->getURI(true), 'project');
module/program/view/browse.html.php
+4 -4
View File
@@ -26,12 +26,12 @@
<?php echo html::checkbox('showClosed', array('1' => $lang->program->showClosed), '', $this->cookie->showClosed ? 'checked=checked' : '');?>
</div>
<div class='pull-right'>
<?php if(isset($lang->pageActions)) echo $lang->pageActions;?>
<?php if(isset($this->config->maxVersion)):?>
<?php common::printLink('project', 'createGuide', "programID=0&from=PGM", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
<?php common::printLink('project', 'createGuide', "programID=0&from=PGM", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-secondary" data-toggle="modal" data-target="#guideDialog"');?>
<?php elseif($this->config->systemMode == 'new'):?>
<?php common::printLink('project', 'create', "mode=scrum&programID=0", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary"');?>
<?php common::printLink('project', 'create', "mode=scrum&programID=0", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-secondary"');?>
<?php endif;?>
<?php if(isset($lang->pageActions)) echo $lang->pageActions;?>
</div>
</div>
<div id='mainContent' class='main-row'>
@@ -44,7 +44,7 @@
</div>
<?php else:?>
<div class='main-col'>
<?php
<?php
if($programType == 'bygrid')
{
include 'browsebygrid.html.php';
module/program/view/browsebylist.html.php
+2 -2
View File
@@ -8,9 +8,9 @@
<a class='table-nest-toggle table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse;?>'></a>
<?php echo $lang->nameAB;?>
</th>
<th class='w-90px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->program->status);?></th>
<th class='w-100px'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->program->PM);?></th>
<th class='text-right w-100px'><?php common::printOrderLink('budget', $orderBy, $vars, $lang->project->budget);?></th>
<th class='w-90px'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->program->status);?></th>
<th class='w-100px'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->project->begin);?></th>
<th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->project->end);?></th>
<th class='text-center w-180px'><?php echo $lang->actions;?></th>
@@ -53,13 +53,13 @@
<?php echo html::a($this->createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name);?>
<?php endif;?>
</td>
<td class='c-status'><span class="status-program status-<?php echo $program->status?>"><?php echo zget($lang->project->statusList, $program->status, '');?></span></td>
<td>
<?php $userID = isset($PMList[$program->PM]) ? $PMList[$program->PM]->id : ''?>
<?php if(!empty($program->PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $program->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");?>
</td>
<?php $programBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$program->budget / 10000, 2) . $lang->project->tenThousand : round((float)$program->budget, 2);?>
<td class='text-right'><?php echo $program->budget != 0 ? zget($lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $lang->project->future;?></td>
<td class='c-status'><span class="status-program status-<?php echo $program->status?>"><?php echo zget($lang->project->statusList, $program->status, '');?></span></td>
<td><?php echo $program->begin;?></td>
<td><?php echo $program->end == LONG_TIME ? $lang->program->longTime : $program->end;?></td>
<td class='c-actions'>