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

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

Browse Source
This commit is contained in:
lichengjun
2021-09-14 03:33:13 +00:00
parent fdb1aa702f aa8ca4b8ed
commit aebeda9ce2
20 changed files with 71 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/stories.php
+5 -1
View File
@@ -65,8 +65,12 @@ class storiesEntry extends entry
* @access public
* @return void
*/
public function post($productID)
public function post($productID = 0)
{
if(!$productID) $productID = $this->param('product');
if(!$productID and isset($this->requestBody->product)) $productID = $this->requestBody->product;
if(!$productID) return $this->sendError(400, 'Need product id.');
$fields = 'title,spec,verify,reviewer,type';
$this->batchSetPost($fields);
api/v1/entries/testcases.php
+1 -1
View File
@@ -50,7 +50,7 @@ class testcasesEntry extends entry
$result[] = $this->format($case, 'openedDate:time,lastEditedDate:time,lastRunDate:time,scriptedDate:date,reviewedDate:date,deleted:bool');
}
return $this->send(200, array('page' => $pager->pageID, 'total' => $pager->recTotal, 'limit' => $pager->recPerPage, 'tasks' => $result));
return $this->send(200, array('page' => $pager->pageID, 'total' => $pager->recTotal, 'limit' => $pager->recPerPage, 'testcases' => $result));
}
if(isset($data->status) and $data->status == 'fail') return $this->sendError(400, $data->message);
module/bug/control.php
+6 -6
View File
@@ -202,7 +202,7 @@ class bug extends control
$this->bug->buildSearchForm($productID, $this->products, $queryID, $actionURL);
$showModule = !empty($this->config->datatable->bugBrowse->showModule) ? $this->config->datatable->bugBrowse->showModule : '';
$productName = $productID ? $this->products[$productID] : $this->lang->product->allProduct;
$productName = ($productID and isset($this->products[$productID])) ? $this->products[$productID] : $this->lang->product->allProduct;
/* Set view. */
$this->view->title = $productName . $this->lang->colon . $this->lang->bug->common;
@@ -573,16 +573,16 @@ class bug extends control
/* Set custom. */
foreach(explode(',', $this->config->bug->list->customCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field;
$title = isset($this->products[$productID]) ? $this->products[$productID] . $this->lang->colon . $this->lang->bug->create : $this->lang->bug->create;
$this->view->title = $title;
$this->view->customFields = $customFields;
$this->view->showFields = $this->config->bug->custom->createFields;
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->create;
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->bug->create;
$this->view->products = $products;
$this->view->productID = $productID;
$this->view->productName = $this->products[$productID];
$this->view->productName = isset($this->products[$productID]) ? $this->products[$productID] : '';
$this->view->moduleOptionMenu = $moduleOptionMenu;
$this->view->stories = $stories;
$this->view->projects = $projects;
module/bug/model.php
+1 -1
View File
@@ -1288,7 +1288,7 @@ class bugModel extends model
public function buildSearchForm($productID, $products, $queryID, $actionURL)
{
$projectID = $this->lang->navGroup->bug == 'qa' ? 0 : $this->session->project;
$productParams = $productID ? array($productID => $products[$productID]) : $products;
$productParams = ($productID and isset($products[$productID])) ? array($productID => $products[$productID]) : $products;
$productParams = $productParams + array('all' => $this->lang->bug->allProduct);
/* Get all modules. */
module/execution/css/grouptask.css
+2
View File
@@ -25,3 +25,5 @@
.is-firefox .group-header > a,
.is-firefox .group-header > .groupSummary {position: relative; z-index: 1;}
.c-hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: right;}
.c-user, .c-type {width: 70px;}
.c-progress {width: 60px;}
module/execution/css/team.css
+1
View File
@@ -1 +1,2 @@
#memberList tbody td {text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
.c-limited {width: 100px;}
module/execution/view/grouptask.html.php
+7 -7
View File
@@ -112,15 +112,15 @@
</div>
</th>
<th class="c-id-sm"><?php echo $lang->task->id;?></th>
<th class="c-pri w-50px"><?php echo $lang->priAB;?></th>
<th class="c-pri"><?php echo $lang->priAB;?></th>
<th class="c-name text-left"><?php echo $lang->task->name;?></th>
<th class="c-status"><?php echo $lang->task->status;?></th>
<th class="text-left w-60px"><?php echo $lang->task->assignedTo;?></th>
<th class="w-90px"><?php echo $lang->task->finishedBy;?></th>
<th class="w-60px c-hours"><?php echo $lang->task->estimateAB;?></th>
<th class="w-50px c-hours"><?php echo $lang->task->consumedAB;?></th>
<th class="w-50px c-hours"><?php echo $lang->task->leftAB;?></th>
<th class="w-50px" title='<?php echo $lang->task->progress;?>'><?php echo $lang->task->progressAB;?></th>
<th class="text-left c-user"><?php echo $lang->task->assignedTo;?></th>
<th class="c-user"><?php echo $lang->task->finishedBy;?></th>
<th class="c-hours"><?php echo $lang->task->estimateAB;?></th>
<th class="c-hours"><?php echo $lang->task->consumedAB;?></th>
<th class="c-hours"><?php echo $lang->task->leftAB;?></th>
<th class="c-progress" title='<?php echo $lang->task->progress;?>'><?php echo $lang->task->progressAB;?></th>
<th class="c-type"><?php echo $lang->typeAB;?></th>
<th class="c-date"><?php echo $lang->task->deadlineAB;?></th>
<th class="c-actions-3"><?php echo $lang->actions;?></th>
module/execution/view/team.html.php
+2 -2
View File
@@ -55,9 +55,9 @@
<th><?php echo $lang->team->days;?></th>
<th><?php echo $lang->team->hours;?></th>
<th><?php echo $lang->team->totalHours;?></th>
<th class='w-100px text-center'><?php echo $lang->team->limited;?></th>
<th class='c-limited text-center'><?php echo $lang->team->limited;?></th>
<?php if($canBeChanged):?>
<th class='c-actions-1 w-80px text-center'><?php echo $lang->actions;?></th>
<th class='c-actions-2 text-center'><?php echo $lang->actions;?></th>
<?php endif;?>
</tr>
</thead>
module/personnel/css/accessible.css
+4
View File
@@ -0,0 +1,4 @@
.c-id {width: 40px;}
.c-department {width: 120px;}
.c-user, .c-job {width: 80px;}
.c-genders {width: 60px;}
module/personnel/css/invest.css
+1
View File
@@ -0,0 +1 @@
.c-story {width: 150px;}
module/personnel/css/whitelist.css
+2
View File
@@ -1 +1,3 @@
.c-dept {overflow:hidden; text-overflow: ellipsis; white-space: nowrap;}
.c-phone {width: 120px;}
.c-email {width: 200px;}
module/personnel/view/accessible.html.php
+6 -6
View File
@@ -36,12 +36,12 @@ js::set('deptID', $deptID);
<table id="accessibleList" class="table has-sort-head">
<thead>
<tr>
<th class="c-id w-40px"><?php echo $lang->idAB;?></th>
<th class="w-120px"><?php echo $lang->personnel->department;?></th>
<th class="w-80px"><?php echo $lang->personnel->realName;?></th>
<th class="w-80px"><?php echo $lang->personnel->userName;?></th>
<th class="w-80px"><?php echo $lang->personnel->job;?></th>
<th class="w-60px"><?php echo $lang->personnel->genders;?></th>
<th class="c-id"><?php echo $lang->idAB;?></th>
<th class="c-department"><?php echo $lang->personnel->department;?></th>
<th class="c-user"><?php echo $lang->personnel->realName;?></th>
<th class="c-user"><?php echo $lang->personnel->userName;?></th>
<th class="c-job"><?php echo $lang->personnel->job;?></th>
<th class="c-genders"><?php echo $lang->personnel->genders;?></th>
</tr>
</thead>
<tbody>
module/personnel/view/invest.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<th colspan="2"><?php echo $lang->personnel->workingHours;?></th>
<th colspan="3"><?php echo $lang->personnel->task;?></th>
<th colspan="3"><?php echo $lang->personnel->bug;?></th>
<th <?php echo $config->URAndSR ? "colspan='2'" : "rowspan='2'";?> class="w-150px"><?php echo $lang->personnel->createStories;?></th>
<th <?php echo $config->URAndSR ? "colspan='2'" : "rowspan='2'";?> class="c-story"><?php echo $lang->personnel->createStories;?></th>
<?php if(isset($this->config->maxVersion)): ?>
<th colspan="3"><?php echo $lang->personnel->issue;?></th>
<th colspan="3"><?php echo $lang->personnel->risk;?></th>
module/personnel/view/whitelist.html.php
+6 -6
View File
@@ -35,12 +35,12 @@
</th>
<th><?php echo $lang->user->realname;?></th>
<th class="c-dept"><?php echo $lang->user->dept;?></th>
<th class="w-120px"><?php echo $lang->user->role;?></th>
<th class="w-120px"><?php echo $lang->user->phone;?></th>
<th class="w-120px"><?php echo $lang->user->qq;?></th>
<th class="w-120px"><?php echo $lang->user->weixin;?></th>
<th class="w-200px"><?php echo $lang->user->email;?></th>
<th class='c-actions w-60px'><?php echo $lang->actions;?></th>
<th class="c-role"><?php echo $lang->user->role;?></th>
<th class="c-phone"><?php echo $lang->user->phone;?></th>
<th class="c-qq"><?php echo $lang->user->qq;?></th>
<th class="c-weixin"><?php echo $lang->user->weixin;?></th>
<th class="c-email"><?php echo $lang->user->email;?></th>
<th class='c-actions-2'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
module/repo/css/browse.css
+7
View File
@@ -3,3 +3,10 @@
.main-row {width: 99%;}
.btn-toolbar > .last-sync-time {display: inline-block; float: left; margin-right: 10px;}
.dropdown-menu > li.selected > a:after {content: '';}
.c-name {min-width: 150px;}
.c-checkbox {width: 40px;}
.c-version {width: 80px;}
.c-commit {width: 70px;}
.c-committer {width: 100px;}
.c-icon {width: 30px;}
module/repo/view/ajaxsidecommits.html.php
+5 -5
View File
@@ -18,13 +18,13 @@ if(isset($entry)) $pathInfo .= '&type=file';
<table class='table table-fixed'>
<thead>
<tr>
<th class='w-40px'></th>
<th class='w-80px'><?php echo $lang->repo->revisionA?></th>
<th class='c-checkbox'></th>
<th class='c-version'><?php echo $lang->repo->revisionA?></th>
<?php if($repo->SCM != 'Subversion'):?>
<th class='w-70px'><?php echo $lang->repo->commit?></th>
<th class='c-commit'><?php echo $lang->repo->commit?></th>
<?php endif;?>
<th class='w-80px'><?php echo $lang->repo->time?></th>
<th class='w-100px'><?php echo $lang->repo->committer?></th>
<th class='c-date'><?php echo $lang->repo->time?></th>
<th class='c-committer'><?php echo $lang->repo->committer?></th>
<th><?php echo $lang->repo->comment?></th>
</tr>
</thead>
module/repo/view/browse.html.php
+5 -5
View File
@@ -66,11 +66,11 @@
<table class='table table-fixed'>
<thead>
<tr>
<th width='30'></th>
<th style="min-width: 150px;"><?php echo $lang->repo->name?></th>
<th width='80' class='text-center'><?php echo $lang->repo->revisions?></th>
<th width='80'><?php echo $lang->repo->time?></th>
<th width='120'><?php echo $lang->repo->committer?></th>
<th class='c-icon'></th>
<th class='c-name'><?php echo $lang->repo->name?></th>
<th class='text-center c-version'><?php echo $lang->repo->revisions?></th>
<th class='c-date'><?php echo $lang->repo->time?></th>
<th class='c-user'><?php echo $lang->repo->committer?></th>
<th><?php echo $lang->repo->comment?></th>
</tr>
</thead>
module/stakeholder/css/browse.css
+2
View File
@@ -1 +1,3 @@
table td, table th {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
.c-phone {width: 120px;}
.c-email {width: 200px;}
module/stakeholder/view/browse.html.php
+6 -6
View File
@@ -33,12 +33,12 @@
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<th><?php echo $lang->stakeholder->name;?></th>
<th class="w-100px"><?php echo $lang->stakeholder->common . $lang->stakeholder->type;?></th>
<th class="w-120px"><?php echo $lang->stakeholder->phone;?></th>
<th class="w-120px"><?php echo $lang->stakeholder->qq;?></th>
<th class="w-120px"><?php echo $lang->stakeholder->weixin;?></th>
<th class="w-200px"><?php echo $lang->stakeholder->email;?></th>
<th class='c-actions text-center w-150px'><?php echo $lang->actions;?></th>
<th class="c-type"><?php echo $lang->stakeholder->common . $lang->stakeholder->type;?></th>
<th class="c-phone"><?php echo $lang->stakeholder->phone;?></th>
<th class="c-qq"><?php echo $lang->stakeholder->qq;?></th>
<th class="c-weixin"><?php echo $lang->stakeholder->weixin;?></th>
<th class="c-email"><?php echo $lang->stakeholder->email;?></th>
<th class='c-actions-4 text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
www/theme/default/style.css
+1
View File
@@ -58,6 +58,7 @@ a.showMoreImage:hover {opacity: 1;}
.c-number, .c-stage, .c-role, .c-estimate-box, .c-result {width: 80px;}
.c-company, .c-budget {width: 80px;}
.c-status, .c-type, .c-user, .c-date, .c-encode, .c-resolution, .c-pri-box, .c-extend {width: 100px;}
.c-qq, .c-weixin {width: 120px;}
.c-object-type {width: 130px;}
.c-full-date, .c-mobile, .c-email, .c-text, .c-subject, .c-assigned-box, .c-user-box {width: 150px;}
.c-module, .c-date-box {width: 180px;}